Fixed gridstat -f

Author: bzizou

CHANGELOG.md

@@ -11,6 +11,7 @@ Unreleased
 - Fixed systemd startup script
 - Fixed notifications
 - Fixed OAR_AUTO_RESUBMIT events (resubmit id could be missed) 
+- Fixed gridstat -f
 
 version 3.2.0
 -------------

api/cigri-api.rb

@@ -729,19 +729,19 @@ def get_formated_jobs(id, limit, offset)
 
       items = []
       tasks.each do |task|
-        if task['queued_cluster'] and not task['state']
-          task['state']="queued" 
-          task['cluster_id']=task['queued_cluster']
+        if task[:queued_cluster] and not task[:state]
+          task[:state]="queued" 
+          task[:cluster_id]=task[:queued_cluster]
         end
         items << {
-          :id => task['id'],
-          :name => task['name'],
-          :parameters => task['param'],
-          :cluster => CLUSTER_NAMES[task['cluster_id']],
-          :cigri_job_id => task['cigri_job_id'],
-          :remote_id => task['remote_id'],
-          :state => task['state'] || :pending,
-          :href => to_url("campaigns/#{id}/jobs/#{task['id']}")
+          :id => task[:id],
+          :name => task[:name],
+          :parameters => task[:param],
+          :cluster => CLUSTER_NAMES[task[:cluster_id]],
+          :cigri_job_id => task[:cigri_job_id],
+          :remote_id => task[:remote_id],
+          :state => task[:state] || :pending,
+          :href => to_url("campaigns/#{id}/jobs/#{task[:id]}")
         }
       end
 

lib/cigri-iolib.rb

@@ -843,9 +843,12 @@ def get_campaign_tasks(dbh, id, limit, offset)
            OFFSET ?"
 
   res = []
-  dbh.execute(query, id, limit, offset).as(:Struct).fetch(:all).each do |row|
-    res.append(row.to_h)
+  sth = dbh.execute(query, id, limit, offset)
+  sth.as(:Struct).fetch(:all).each do |row|
+    res << row.to_h
   end
+  sth.finish
+  IOLIBLOGGER.debug(res.inspect)
   return res
 end
 
@@ -1704,7 +1707,7 @@ def update(values,table=@table)
           begin
             dbh.execute(query, value, id)
           rescue Exception => e
-            IOLIBLOGGER.error("Error in query `#{query}` with field `#{value}` for id `#{id}`")
+            IOLIBLOGGER.error("Error in query `#{query}` with field `#{value}` for id `#{id}`: #{e}")
             raise
           end
         end