Added timeout properly to orborus as well
This commit is contained in:
@@ -1541,9 +1541,12 @@ func main() {
|
|||||||
log.Printf("[INFO] Execution already handled (rerun of old executions?): %s", execution.ExecutionId)
|
log.Printf("[INFO] Execution already handled (rerun of old executions?): %s", execution.ExecutionId)
|
||||||
toBeRemoved.Data = append(toBeRemoved.Data, execution)
|
toBeRemoved.Data = append(toBeRemoved.Data, execution)
|
||||||
|
|
||||||
|
// Should check when last this was ran, and if it's more than 10 minutes ago and it's not finished, we should run it again?
|
||||||
|
/*
|
||||||
if swarmConfig != "run" && swarmConfig != "swarm" {
|
if swarmConfig != "run" && swarmConfig != "swarm" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now, how do I execute this one?
|
// Now, how do I execute this one?
|
||||||
@@ -1597,6 +1600,11 @@ func main() {
|
|||||||
env = append(env, fmt.Sprintf("SHUFFLE_VOLUME_BINDS=%s", os.Getenv("SHUFFLE_VOLUME_BINDS")))
|
env = append(env, fmt.Sprintf("SHUFFLE_VOLUME_BINDS=%s", os.Getenv("SHUFFLE_VOLUME_BINDS")))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if len(os.Getenv("SHUFFLE_APP_SDK_TIMEOUT")) > 0 {
|
||||||
|
env = append(env, fmt.Sprintf("SHUFFLE_APP_SDK_TIMEOUT=%s", os.Getenv("SHUFFLE_APP_SDK_TIMEOUT")))
|
||||||
|
}
|
||||||
|
|
||||||
// Setting up internal proxy config for Shuffle -> shuffle comms
|
// Setting up internal proxy config for Shuffle -> shuffle comms
|
||||||
overrideHttpProxy := os.Getenv("SHUFFLE_INTERNAL_HTTP_PROXY")
|
overrideHttpProxy := os.Getenv("SHUFFLE_INTERNAL_HTTP_PROXY")
|
||||||
overrideHttpsProxy := os.Getenv("SHUFFLE_INTERNAL_HTTPS_PROXY")
|
overrideHttpsProxy := os.Getenv("SHUFFLE_INTERNAL_HTTPS_PROXY")
|
||||||
|
|||||||
Reference in New Issue
Block a user