Browse code

Merge "Relocate SERVICE_TIMEOUT to stackrc"

Jenkins authored on 2014/10/05 05:52:21
Showing 2 changed files
... ...
@@ -501,9 +501,6 @@ SYSLOG_PORT=${SYSLOG_PORT:-516}
501 501
 # Use color for logging output (only available if syslog is not used)
502 502
 LOG_COLOR=`trueorfalse True $LOG_COLOR`
503 503
 
504
-# Service startup timeout
505
-SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
506
-
507 504
 # Reset the bundle of CA certificates
508 505
 SSL_BUNDLE_FILE="$DATA_DIR/ca-bundle.pem"
509 506
 rm -f $SSL_BUNDLE_FILE
... ...
@@ -580,6 +580,11 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
580 580
 # Also sets the minimum number of workers to 2.
581 581
 API_WORKERS=${API_WORKERS:=$(( ($(nproc)/2)<2 ? 2 : ($(nproc)/2) ))}
582 582
 
583
+# Service startup timeout
584
+SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
585
+
586
+# Following entries need to be last items in file
587
+
583 588
 # Local variables:
584 589
 # mode: shell-script
585 590
 # End: