@@ -23,22 +23,23 @@ function generateProgram($connection, $queue, $tries, $sleep, $numProcs, $startS
2323} else if (file_exists ('/var/app/current/jsonEnv ' )){
2424 $ envLocation = '/var/app/current/jsonEnv ' ;
2525}
26- $ envVars = json_decode (file_get_contents ($ envLocation ), true );
26+ $ vars = json_decode (file_get_contents ($ envLocation ), true );
27+ $ envVars = array_change_key_case ($ vars ); // convert keys to lower case so environmental variables don't have to be case-sensitive
2728
2829$ programs = '' ;
2930
3031foreach ($ envVars as $ key => $ val ){
31- if (strpos (strtolower ( $ key) , 'queue ' ) !== false && strpos (strtolower ( $ key) , 'queue_driver ' ) === false ){
32- $ tryKey = substr ($ key , 10 ) . 'Tries ' ; //get queue $key + tries to see if custom tries is set
33- $ sleepKey = substr ($ key , 5 ) . 'Sleep ' ; //get queue $key + sleep to see if custom sleep is set
34- $ numProcKey = substr ($ key , 5 ) . 'NumProcs ' ; //get queue $key + num process to see if custom number of processes is set
35- $ startSecsKey = substr ($ key , 5 ) . 'StartSecs ' ; //get queue $key + number of seconds the process should stay up
32+ if (strpos ($ key , 'queue ' ) !== false && strpos ($ key , 'queue_driver ' ) === false ){
33+ $ tryKey = substr ($ key , 10 ) . 'tries ' ; //get queue $key + tries to see if custom tries is set
34+ $ sleepKey = substr ($ key , 5 ) . 'sleep ' ; //get queue $key + sleep to see if custom sleep is set
35+ $ numProcKey = substr ($ key , 5 ) . 'numprocs ' ; //get queue $key + num process to see if custom number of processes is set
36+ $ startSecsKey = substr ($ key , 5 ) . 'startsecs ' ; //get queue $key + number of seconds the process should stay up
3637
3738 $ tries = isset ($ envVars [$ tryKey ]) ? $ envVars [$ tryKey ] : 5 ;
3839 $ sleep = isset ($ envVars [$ sleepKey ]) ? $ envVars [$ sleepKey ] : 5 ;
3940 $ numProcs = isset ($ envVars [$ numProcKey ]) ? $ envVars [$ numProcKey ] : 1 ;
4041 $ startSecs = isset ($ envVars [$ startSecsKey ]) ? $ envVars [$ startSecsKey ] : 1 ;
41- $ connection = isset ($ envVars ['QUEUE_DRIVER ' ]) ? $ envVars ['QUEUE_DRIVER ' ] : 'beanstalkd ' ;
42+ $ connection = isset ($ envVars ['queue_driver ' ]) ? $ envVars ['queue_driver ' ] : 'beanstalkd ' ;
4243 $ programs .= generateProgram ($ connection , $ val , $ tries , $ sleep , $ numProcs , $ startSecs );
4344 }
4445}
0 commit comments