Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit dc8fdb1f56f92cae265bbf0dd6e9eadda0370786
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Aug 20 16:00:14 2015 +0200
[backend] minor fixes
---------------------------------------------------------------
backend/backend/daemons/backend.py | 2 ++
backend/backend/daemons/vm_master.py | 4 ++--
backend/backend/vm_manage/event_handle.py | 4 +---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/backend/backend/daemons/backend.py b/backend/backend/daemons/backend.py
index de709a7..ddf1565 100644
--- a/backend/backend/daemons/backend.py
+++ b/backend/backend/daemons/backend.py
@@ -138,7 +138,9 @@ class CoprBackend(object):
self.event_handler = EventHandler(self.opts,
vmm=self.vm_manager,
terminator=self.terminator)
+ self.event_handler.post_init()
self.event_handler.start()
+
self.log.info("Starting up VM Master")
self.vm_master = VmMaster(self.opts,
vmm=self.vm_manager,
diff --git a/backend/backend/daemons/vm_master.py b/backend/backend/daemons/vm_master.py
index 3977ee8..c6a61c8 100644
--- a/backend/backend/daemons/vm_master.py
+++ b/backend/backend/daemons/vm_master.py
@@ -255,8 +255,8 @@ class VmMaster(Process):
# todo: self.terminate_excessive_vms() -- for case when config changed during
runtime
def run(self):
- if any(x is None for x in [self.spawner, self.checker, self.event_handler]):
- raise RuntimeError("provide Spawner, HealthChecker and EventHandler
"
+ if any(x is None for x in [self.spawner, self.checker]):
+ raise RuntimeError("provide Spawner and HealthChecker "
"to run VmManager daemon")
setproctitle("VM master")
diff --git a/backend/backend/vm_manage/event_handle.py
b/backend/backend/vm_manage/event_handle.py
index 587859c..2c8fc13 100644
--- a/backend/backend/vm_manage/event_handle.py
+++ b/backend/backend/vm_manage/event_handle.py
@@ -131,9 +131,7 @@ class EventHandler(Process):
.format(msg.get("vm_ip"),
msg.get("vm_name"), msg.get("msg")))
def run(self):
- # setproctitle("Event Handler")
-
- self.post_init()
+ setproctitle("Event Handler")
self.do_recycle_proc = Recycle(terminator=self.terminator,
recycle_period=self.recycle_period)
self.do_recycle_proc.start()