Bläddra i källkod

Rotational training registration to message-bus (#903)

link 2 år sedan
förälder
incheckning
a7126cac63
2 ändrade filer med 13 tillägg och 9 borttagningar
  1. 1 1
      build/sysroot/usr/lib/systemd/system/rclone.service
  2. 12 8
      main.go

+ 1 - 1
build/sysroot/usr/lib/systemd/system/rclone.service

@@ -2,7 +2,7 @@
 Description=rclone
 Description=rclone
 
 
 [Service]
 [Service]
-ExecStartPre=/usr/bin/rm -f /var/run/rclone/rclone.sock
+ExecStartPre=/usr/bin/mkdir -p /var/run/rclone && /usr/bin/rm -f /var/run/rclone/rclone.sock
 ExecStart=/usr/bin/rclone rcd --rc-addr unix:///var/run/rclone/rclone.sock --rc-no-auth --rc-allow-origin "*"
 ExecStart=/usr/bin/rclone rcd --rc-addr unix:///var/run/rclone/rclone.sock --rc-no-auth --rc-allow-origin "*"
 Restart=always
 Restart=always
 RestartSec=10
 RestartSec=10

+ 12 - 8
main.go

@@ -165,14 +165,18 @@ func main() {
 	events = append(events, message_bus.EventType{Name: "casaos:file:recover", SourceID: common.SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}})
 	events = append(events, message_bus.EventType{Name: "casaos:file:recover", SourceID: common.SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}})
 	events = append(events, message_bus.EventType{Name: "casaos:file:operate", SourceID: common.SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}})
 	events = append(events, message_bus.EventType{Name: "casaos:file:operate", SourceID: common.SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}})
 	// register at message bus
 	// register at message bus
-
-	response, err := service.MyService.MessageBus().RegisterEventTypesWithResponse(context.Background(), events)
-	if err != nil {
-		logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.Error(err))
-	}
-
-	if response != nil && response.StatusCode() != http.StatusOK {
-		logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.String("status", response.Status()), zap.String("body", string(response.Body)))
+	for i := 0; i < 10; i++ {
+		response, err := service.MyService.MessageBus().RegisterEventTypesWithResponse(context.Background(), events)
+		if err != nil {
+			logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.Error(err))
+		}
+		if response != nil && response.StatusCode() != http.StatusOK {
+			logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.String("status", response.Status()), zap.String("body", string(response.Body)))
+		}
+		if response.StatusCode() == http.StatusOK {
+			break
+		}
+		time.Sleep(time.Second)
 	}
 	}
 
 
 	go func() {
 	go func() {