X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2FstEvent.go;h=6cb7a31bbdda79b305af572a02fdb26be9b4e8b1;hb=df1af33ecdd4295171c4efa116c62a03f39df881;hp=bf2a809e28be0c51484c7e09451c4f59aae06096;hpb=8f44cc7217ce48f3f94c8ea3f037cdf011c4493b;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/syncthing/stEvent.go b/lib/syncthing/stEvent.go
index bf2a809..6cb7a31 100644
--- a/lib/syncthing/stEvent.go
+++ b/lib/syncthing/stEvent.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package st
 
 import (
@@ -148,6 +165,8 @@ func (e *Events) getEvents(since int) ([]STEvent, error) {
 func (e *Events) monitorLoop() {
 	e.log.Infof("Event monitoring running...")
 	since := 0
+	cntErrConn := 0
+	cntErrRetry := 1
 	for {
 		select {
 		case <-e.stop:
@@ -155,11 +174,32 @@ func (e *Events) monitorLoop() {
 			return
 
 		case <-time.After(e.MonitorTime * time.Millisecond):
+
+			if !e.st.Connected {
+				cntErrConn++
+				time.Sleep(time.Second)
+				if cntErrConn > cntErrRetry {
+					e.log.Error("ST Event monitor: ST connection down")
+					cntErrConn = 0
+					cntErrRetry *= 2
+					if _, err := e.getEvents(since); err == nil {
+						e.st.Connected = true
+						cntErrRetry = 1
+						// XXX - should we reset since value ?
+						goto readEvent
+					}
+				}
+				continue
+			}
+
+		readEvent:
 			stEvArr, err := e.getEvents(since)
 			if err != nil {
 				e.log.Errorf("Syncthing Get Events: %v", err)
+				e.st.Connected = false
 				continue
 			}
+
 			// Process events
 			for _, stEv := range stEvArr {
 				since = stEv.SubscriptionID