diff --git a/backend/go-app/docker.go b/backend/go-app/docker.go index a8a34072..9906f3b7 100755 --- a/backend/go-app/docker.go +++ b/backend/go-app/docker.go @@ -832,14 +832,23 @@ func handleRemoteDownloadApp(resp http.ResponseWriter, ctx context.Context, user type tmpapp struct { Success bool `json:"success"` OpenAPI string `json:"openapi"` + App string `json:"app"` } app := tmpapp{} err := json.Unmarshal(respBody, &app) if err != nil || app.Success == false || len(app.OpenAPI) == 0 { log.Printf("[ERROR] Failed app unmarshal during auto-download. Success: %#v. Applength: %d: %s", app.Success, len(app.OpenAPI), err) + resp.WriteHeader(401) + if len(app.App) > 0 { + resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Not an OpenAPI app, but a Python app. Please download the app using the Remote Download system: https://shuffler.io/docs/apps#importing-remote-apps"}`))) + } else { + resp.Write([]byte(`{"success": false, "reason": "App doesn't exist"}`)) + } + resp.Write([]byte(`{"success": false, "reason": "App doesn't exist"}`)) + return } diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index 857e216d..26c030ce 100755 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -2903,7 +2903,7 @@ func createAndStartTenzirNode(ctx context.Context, containerName, imageName stri _, err := dockercli.ContainerCreate(ctx, config, hostConfig, networkingConfig, nil, containerName) if err != nil { if strings.Contains(err.Error(), "path does not exist") { - log.Printf("[ERROR] Not using permanent pipeline storage as storage folder /opt/tenzir/ does not exist. If you want permanent storage, create the /opt/tendir/ folder then restart Orborus. Raw: %s", err) + log.Printf("[ERROR] Not using permanent pipeline storage as storage folder %s does not exist. If you want permanent storage, create the %s folder then restart Orborus (1). Raw: %s", tenzirStorageFolder, tenzirStorageFolder, err) skipPipelineMount = true } else { log.Printf("[ERROR] Failed to create Tenzir Node container: %v", err) @@ -2914,7 +2914,13 @@ func createAndStartTenzirNode(ctx context.Context, containerName, imageName stri err = dockercli.ContainerStart(ctx, containerName, containerStartOptions) if err != nil { - log.Printf("[ERROR] Failed to start Tenzir Node container: %v", err) + if strings.Contains(err.Error(), "path does not exist") { + log.Printf("[ERROR] Not using permanent pipeline storage as storage folder %s does not exist. If you want permanent storage, create the %s folder then restart Orborus (2). Raw: %s", tenzirStorageFolder, tenzirStorageFolder, err) + skipPipelineMount = true + } else { + log.Printf("[ERROR] Failed to START Tenzir Node container: %v", err) + } + return err }