Fix check for crunch-job missing from path, and run it as arv-crunch-job.
authorTom Clegg <tom@curoverse.com>
Fri, 7 Mar 2014 18:37:03 +0000 (13:37 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 7 Mar 2014 18:37:03 +0000 (13:37 -0500)
services/api/script/crunch-dispatch.rb

index 59ea162c0e44a8fda87f70d9c2257ec6a3eac7c3..ecc7f5d98ebb033250e24ea368f26e989e97258f 100755 (executable)
@@ -144,16 +144,17 @@ class Dispatcher
             api_client_id: 0)
       job_auth.save
 
-      cmd_args << (ENV['CRUNCH_JOB_BIN'] || `which crunch-job`.strip)
+      crunch_job_bin = (ENV['CRUNCH_JOB_BIN'] || `which arv-crunch-job`.strip)
+      if crunch_job_bin == ''
+        raise "No CRUNCH_JOB_BIN env var, and crunch-job not in path."
+      end
+
+      cmd_args << crunch_job_bin
       cmd_args << '--job-api-token'
       cmd_args << job_auth.api_token
       cmd_args << '--job'
       cmd_args << job.uuid
 
-      if cmd_args[0] == ''
-        raise "No CRUNCH_JOB_BIN env var, and crunch-job not in path."
-      end
-
       commit = Commit.where(sha1: job.script_version).first
       if commit
         cmd_args << '--git-dir'