Revision 6046dca9

b/src/Ganeti/JQScheduler.hs
44 44
import Ganeti.Constants as C
45 45
import Ganeti.JQueue as JQ
46 46
import Ganeti.Logging
47
import Ganeti.Objects (ConfigData)
47 48
import Ganeti.Path
48 49
import Ganeti.Types
49 50
import Ganeti.Utils
......
66 67

  
67 68
data JQStatus = JQStatus
68 69
  { jqJobs :: IORef Queue
70
  , jqConfig :: IORef (Result ConfigData)
69 71
  }
70 72

  
71 73

  
72
emptyJQStatus :: IO JQStatus
73
emptyJQStatus = do
74
  jqJ <- newIORef Queue {qEnqueued=[], qRunning=[]}
75
  return JQStatus { jqJobs=jqJ }
74
emptyJQStatus :: IORef (Result ConfigData) -> IO JQStatus
75
emptyJQStatus config = do
76
  jqJ <- newIORef Queue { qEnqueued = [], qRunning = []}
77
  return JQStatus { jqJobs = jqJ, jqConfig = config }
76 78

  
77 79
-- | Apply a function on the running jobs.
78 80
onRunningJobs :: ([JobWithStat] -> [JobWithStat]) -> Queue -> Queue
b/src/Ganeti/Query/Server.hs
396 396
  s <- describeError "binding to the Luxi socket"
397 397
         Nothing (Just socket_path) $ getLuxiServer True socket_path
398 398
  cref <- newIORef (Bad "Configuration not yet loaded")
399
  jq <- emptyJQStatus
399
  jq <- emptyJQStatus cref
400 400
  return (s, cref, jq)
401 401

  
402 402
-- | Main function.

Also available in: Unified diff