octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear acknowledged errors server-side as well (fixes #128)

Browse Source
This commit is contained in:
Jakob Borg 2014-04-16 16:30:49 +02:00
parent 622568c327
commit a98d75edaa
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

7
cmd/syncthing/gui.go
View File

@ -41,6 +41,7 @@ func startGUI(cfg GUIConfiguration, m *Model) {
router.Post("/rest/restart", restPostRestart) router.Post("/rest/restart", restPostRestart)
router.Post("/rest/reset", restPostReset) router.Post("/rest/reset", restPostReset)
router.Post("/rest/error", restPostError) router.Post("/rest/error", restPostError)
router.Post("/rest/error/clear", restClearErrors)
go func() { go func() {
mr := martini.New() mr := martini.New()
@ -191,6 +192,12 @@ func restPostError(req *http.Request) {
showGuiError(string(bs)) showGuiError(string(bs))
} }
func restClearErrors() {
guiErrorsMut.Lock()
guiErrors = nil
guiErrorsMut.Unlock()
}
func showGuiError(err string) { func showGuiError(err string) {
guiErrorsMut.Lock() guiErrorsMut.Lock()
guiErrors = append(guiErrors, guiError{time.Now(), err}) guiErrors = append(guiErrors, guiError{time.Now(), err})

1
gui/app.js
View File

@ -334,6 +334,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
$scope.clearErrors = function () { $scope.clearErrors = function () {
$scope.seenError = $scope.errors[$scope.errors.length - 1].Time; $scope.seenError = $scope.errors[$scope.errors.length - 1].Time;
$http.post('/rest/error/clear');
}; };
$scope.friendlyNodes = function (str) { $scope.friendlyNodes = function (str) {