diff --git a/daemon/core/service.py b/daemon/core/service.py index 47e6eb99..9aadc03b 100644 --- a/daemon/core/service.py +++ b/daemon/core/service.py @@ -72,6 +72,8 @@ class ServiceManager(object): """ services = utils.load_classes(path, CoreService) for service in services: + if not service._name: + continue service.on_load() cls.add(service) diff --git a/daemon/core/services/bird.py b/daemon/core/services/bird.py index 34884e51..097053c4 100644 --- a/daemon/core/services/bird.py +++ b/daemon/core/services/bird.py @@ -90,7 +90,7 @@ class BirdService(CoreService): common to Bird's routing daemons. """ - _name = "BirdDaemon" + _name = None _group = "BIRD" _depends = ("bird",) _dirs = () diff --git a/daemon/core/services/nrl.py b/daemon/core/services/nrl.py index 6661ec49..5fe74ecd 100644 --- a/daemon/core/services/nrl.py +++ b/daemon/core/services/nrl.py @@ -13,7 +13,7 @@ class NrlService(CoreService): Parent class for NRL services. Defines properties and methods common to NRL's routing daemons. """"" - _name = "Protean" + _name = None _group = "ProtoSvc" _depends = () _dirs = () diff --git a/daemon/core/services/quagga.py b/daemon/core/services/quagga.py index ca6f0ad8..feb4eac7 100644 --- a/daemon/core/services/quagga.py +++ b/daemon/core/services/quagga.py @@ -222,7 +222,7 @@ class QuaggaService(CoreService): Parent class for Quagga services. Defines properties and methods common to Quagga's routing daemons. """ - _name = "QuaggaDaemon" + _name = None _group = "Quagga" _depends = ("zebra",) _dirs = () diff --git a/daemon/core/services/sdn.py b/daemon/core/services/sdn.py index 63ca610a..9d8a26ba 100644 --- a/daemon/core/services/sdn.py +++ b/daemon/core/services/sdn.py @@ -11,7 +11,7 @@ class SdnService(CoreService): """ Parent class for SDN services. """ - _name = "SdnProcess" + _name = None _group = "SDN" _depends = () _dirs = () diff --git a/daemon/core/services/utility.py b/daemon/core/services/utility.py index c0d3a931..e1495ca9 100644 --- a/daemon/core/services/utility.py +++ b/daemon/core/services/utility.py @@ -16,7 +16,7 @@ class UtilService(CoreService): """ Parent class for utility services. """ - _name = "UtilityProcess" + _name = None _group = "Utility" _depends = () _dirs = () diff --git a/daemon/core/services/xorp.py b/daemon/core/services/xorp.py index fff574ea..bbe58769 100644 --- a/daemon/core/services/xorp.py +++ b/daemon/core/services/xorp.py @@ -74,7 +74,7 @@ class XorpService(CoreService): Parent class for XORP services. Defines properties and methods common to XORP's routing daemons. """ - _name = "XorpDaemon" + _name = None _group = "XORP" _depends = ("xorp_rtrmgr",) _dirs = ()