Fixed hybrid schedules

backend/go-app/main.go

@@ -3679,14 +3679,17 @@ func remoteOrgJobController(org shuffle.Org, body []byte) error {
 	if !responseData.Success {
 		log.Printf("[WARNING] Should stop org job controller because no success?")
 
-		if strings.Contains(responseData.Reason, "Bad apikey") || strings.Contains(responseData.Reason, "Error getting the organization") || strings.Contains(responseData.Reason, "Organization isn't syncing") {
+		if strings.Contains(strings.ToLower(responseData.Reason), "bad apikey") || strings.Contains(responseData.Reason, "Error getting the organization") || strings.Contains(responseData.Reason, "Organization isn't syncing") {
 			log.Printf("[WARNING] Remote error; Bad apikey or org error. Stopping sync for org: %s", responseData.Reason)
 
 			if value, exists := scheduledOrgs[org.Id]; exists {
 				// Looks like this does the trick? Hurr
-				log.Printf("[WARNING] STOPPING ORG SCHEDULE for: %s", org.Id)
+				log.Printf("[INFO] STOPPING ORG SCHEDULE for: %s", org.Id)
-
 				value.Lock()
+			} else {
+				log.Printf("[INFO] Failed finding the schedule for org %s (%s)", org.Name, org.Id)
+			}
+
 			org, err := shuffle.GetOrg(ctx, org.Id)
 			if err != nil {
 				log.Printf("[WARNING] Failed finding org %s: %s", org.Id, err)
@@ -3716,10 +3719,7 @@ func remoteOrgJobController(org shuffle.Org, body []byte) error {
 				log.Printf("[INFO] Successfully STOPPED org cloud sync for %s (%s)", org.Name, org.Id)
 			}
 
-				return errors.New("Stopped schedule for org locally because of bad apikey.")
+			return nil
-			} else {
-				return errors.New(fmt.Sprintf("Failed finding the schedule for org %s (%s)", org.Name, org.Id))
-			}
 		}
 
 		return errors.New("[ERROR] Remote job handler issues.")

functions/onprem/worker/go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.3.59
+	github.com/shuffle/shuffle-shared v0.3.62
 )
 
 require (