Minor print fixes to orborus/worker
This commit is contained in:
+6
-2
@@ -95,12 +95,16 @@ services:
|
|||||||
# image: memcached:latest
|
# image: memcached:latest
|
||||||
# container_name: shuffle-cache
|
# container_name: shuffle-cache
|
||||||
# hostname: shuffle-cache
|
# hostname: shuffle-cache
|
||||||
# mem_limit: 1024m
|
# command: memcached -m 2048 -c 2500
|
||||||
# environment:
|
# environment:
|
||||||
# - MEMCACHED_MEMORY=1024
|
# - MEMCACHED_MEMORY=2048
|
||||||
# - MEMCACHED_MAX_CONNECTIONS=2500
|
# - MEMCACHED_MAX_CONNECTIONS=2500
|
||||||
# ports:
|
# ports:
|
||||||
# - 11211:11211
|
# - 11211:11211
|
||||||
|
# deploy:
|
||||||
|
# resources:
|
||||||
|
# limits:
|
||||||
|
# memory: 2048M
|
||||||
|
|
||||||
#docker-socket-proxy:
|
#docker-socket-proxy:
|
||||||
# image: tecnativa/docker-socket-proxy
|
# image: tecnativa/docker-socket-proxy
|
||||||
|
|||||||
@@ -195,10 +195,10 @@ func getThisContainerId() {
|
|||||||
if containerId == "" {
|
if containerId == "" {
|
||||||
if containerName != "" {
|
if containerName != "" {
|
||||||
containerId = containerName
|
containerId = containerName
|
||||||
log.Printf("[INFO] Falling back to CONTAINER_NAME as container ID")
|
log.Printf("[INFO] Falling back to ORBORUS_CONTAINER_NAME as container ID")
|
||||||
} else {
|
} else {
|
||||||
containerId = "shuffle-orborus"
|
containerId = "shuffle-orborus"
|
||||||
log.Printf(`[WARNING] CONTAINER_NAME is not set. Falling back to default name "%s" as container ID`, containerId)
|
log.Printf(`[WARNING] ORBORUS_CONTAINER_NAME env is not set. Falling back to default name "%s" as container ID. This may cause issues on the same server`, containerId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4028,7 +4028,7 @@ func getStreamResultsWrapper(client *http.Client, req *http.Request, workflowExe
|
|||||||
if newresp.StatusCode != 200 {
|
if newresp.StatusCode != 200 {
|
||||||
log.Printf("[ERROR] StatusCode (1): %d - %s", newresp.StatusCode, string(body))
|
log.Printf("[ERROR] StatusCode (1): %d - %s", newresp.StatusCode, string(body))
|
||||||
time.Sleep(time.Duration(sleepTime) * time.Second)
|
time.Sleep(time.Duration(sleepTime) * time.Second)
|
||||||
return environments, errors.New(fmt.Sprintf("Bad status code: %d", newresp.StatusCode))
|
return environments, errors.New(fmt.Sprintf("Bad status code from backend: %d", newresp.StatusCode))
|
||||||
}
|
}
|
||||||
|
|
||||||
err = json.Unmarshal(body, &workflowExecution)
|
err = json.Unmarshal(body, &workflowExecution)
|
||||||
|
|||||||
Reference in New Issue
Block a user