Skip to content

Commit c65baa9

Browse files
committed
update to add a way to avoid loading parent service classes, that inherit from CoreService that should not be loaded on their own
1 parent ac2b64a commit c65baa9

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

daemon/core/service.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ def add_services(cls, path):
7272
"""
7373
services = utils.load_classes(path, CoreService)
7474
for service in services:
75+
if not service._name:
76+
continue
7577
service.on_load()
7678
cls.add(service)
7779

daemon/core/services/bird.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class BirdService(CoreService):
9090
common to Bird's routing daemons.
9191
"""
9292

93-
_name = "BirdDaemon"
93+
_name = None
9494
_group = "BIRD"
9595
_depends = ("bird",)
9696
_dirs = ()

daemon/core/services/nrl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class NrlService(CoreService):
1313
Parent class for NRL services. Defines properties and methods
1414
common to NRL's routing daemons.
1515
"""""
16-
_name = "Protean"
16+
_name = None
1717
_group = "ProtoSvc"
1818
_depends = ()
1919
_dirs = ()

daemon/core/services/quagga.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class QuaggaService(CoreService):
222222
Parent class for Quagga services. Defines properties and methods
223223
common to Quagga's routing daemons.
224224
"""
225-
_name = "QuaggaDaemon"
225+
_name = None
226226
_group = "Quagga"
227227
_depends = ("zebra",)
228228
_dirs = ()

daemon/core/services/sdn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SdnService(CoreService):
1111
"""
1212
Parent class for SDN services.
1313
"""
14-
_name = "SdnProcess"
14+
_name = None
1515
_group = "SDN"
1616
_depends = ()
1717
_dirs = ()

daemon/core/services/utility.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class UtilService(CoreService):
1616
"""
1717
Parent class for utility services.
1818
"""
19-
_name = "UtilityProcess"
19+
_name = None
2020
_group = "Utility"
2121
_depends = ()
2222
_dirs = ()

daemon/core/services/xorp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class XorpService(CoreService):
7474
Parent class for XORP services. Defines properties and methods
7575
common to XORP's routing daemons.
7676
"""
77-
_name = "XorpDaemon"
77+
_name = None
7878
_group = "XORP"
7979
_depends = ("xorp_rtrmgr",)
8080
_dirs = ()

0 commit comments

Comments
 (0)