Fix the VMPoller worker after some of the refactoring

Author: dnaeon

src/vm-pollerd-worker

@@ -33,11 +33,11 @@ The requests are ZeroMQ messages.
 TODO: Better document this module
 """
 
-from vmpollerd.core import VMPollerDaemon
+from vmpollerd.core import VMPollerWorker
 
 def main():
-    pollerd = VMPollerDaemon("/etc/vm-poller")
-    pollerd.run()
+    worker = VMPollerWorker("/var/run/vm-pollerd-worker.pid")
+    worker.run("/etc/vm-poller/vm-pollerd-worker.conf")
 
 if __name__ == '__main__':
     main()

src/vmpollerd/core.py

@@ -75,7 +75,7 @@ def run(self, config_file):
 
         """
         if not os.path.exists(config_file):
-            raise VMPoller, "Configuration file %s does not exists: %s" % (config_file, e)
+            raise VMPollerException, "Configuration file does not exists: %s" % config_file
 
         config = ConfigParser.ConfigParser()
         config.read(config_file)
@@ -93,7 +93,7 @@ def run(self, config_file):
 
         # Load the config for every Agent and vCenter
         for eachConf in confFiles:
-            agent = VMPollerAgent(eachConf, ignore_locks=True, lockdir="/var/run/vm-pollerd", keep_alive=True)
+            agent = VMPollerWorkerAgent(eachConf, ignore_locks=True, lockdir="/var/run/vm-pollerd", keep_alive=True)
             self.agents[agent.vcenter] = agent
 
         # Time to fire up our poller Agents