Merge pull request #27 from brianhlin/master

Fix bug that prevented HTCondor CE service from starting with multiple job routes

Author: matyasselmeci

config/htcondor-ce.spec

@@ -2,7 +2,7 @@
 #define gitrev osg
 
 Name: htcondor-ce
-Version: 1.12
+Version: 1.13
 Release: 1%{?gitrev:.%{gitrev}git}%{?dist}
 Summary: A framework to run HTCondor as a CE
 
@@ -313,6 +313,9 @@ fi
 %attr(1777,root,root) %dir %{_localstatedir}/lib/gratia/condorce_data
 
 %changelog
+* Mon Apr 27 2015 Brian Lin <blin@cs.wisc.edu> - 1.13-1
+- Fix bug that prevented HTCondor CE service from starting with multiple job routes
+
 * Mon Apr 27 2015 Brian Lin <blin@cs.wisc.edu> - 1.12-1
 - Add ability to constrain via arbitrary ClassAd expression in condor_ce_info_status (SOFTWARE-1842)
 - condor_ce_run now accepts extra attributes via file (SOFTWARE-1641)

src/condor-ce

@@ -50,13 +50,11 @@ start() {
     echo -n $"Starting Condor-CE daemons: "
 
     # Check validity of job router knobs
-    for ATTR in 'JOB_ROUTER_DEFAULTS' 'JOB_ROUTER_ENTRIES'; do
-        python -c "import htcondor; import classad; classad.ExprTree(htcondor.param[\"$ATTR\"])" &> /dev/null
-        if [ $? -ne 0 ]; then
-            echo "Could not read $ATTR in the HTCondor CE configuration. Please verify syntax correctness."
-            exit 6
-        fi
-    done
+    python -c "import htcondor; import classad; classad.ExprTree(htcondor.param['JOB_ROUTER_DEFAULTS'])" &> /dev/null
+    if [ $? -ne 0 ]; then
+        echo "Could not read JOB_ROUTER_DEFAULTS in the HTCondor CE configuration. Please verify syntax correctness."
+        exit 6
+    fi
 
     daemon --pidfile $pidfile --check $prog /usr/share/condor-ce/condor_ce_startup -pidfile $pidfile
     RETVAL=$?