Revision 5e671e0e src/Ganeti/Query/Server.hs

b/src/Ganeti/Query/Server.hs
356 356
  return ()
357 357

  
358 358
-- | Type alias for prepMain results
359
type PrepResult = (FilePath, Server, IORef (Result ConfigData), JQStatus)
359
type PrepResult = (Server, IORef (Result ConfigData), JQStatus)
360 360

  
361 361
-- | Check function for luxid.
362 362
checkMain :: CheckFn ()
......
371 371
         Nothing (Just socket_path) $ getLuxiServer True socket_path
372 372
  cref <- newIORef (Bad "Configuration not yet loaded")
373 373
  jq <- emptyJQStatus 
374
  return (socket_path, s, cref, jq)
374
  return (s, cref, jq)
375 375

  
376 376
-- | Main function.
377 377
main :: MainFn () PrepResult
378
main _ _ (socket_path, server, cref, jq) = do
378
main _ _ (server, cref, jq) = do
379 379
  initConfigReader id cref
380 380
  let creader = readIORef cref
381 381
  initJQScheduler jq
......
386 386

  
387 387
  finally
388 388
    (forever $ listener qlock jq creader server)
389
    (closeServer socket_path server)
389
    (closeServer server)

Also available in: Unified diff