no need for shared instances here
This commit is contained in:
		| @@ -7,7 +7,7 @@ from owrx.feature import FeatureDetector | ||||
| from owrx.source import SdrService, ClientRegistry | ||||
| from socketserver import ThreadingMixIn | ||||
| from owrx.sdrhu import SdrHuUpdater | ||||
| from owrx.service import ServiceManager | ||||
| from owrx.service import Services | ||||
|  | ||||
| import logging | ||||
|  | ||||
| @@ -48,7 +48,7 @@ Author contact info:    Andras Retzler, HA7ILM <randras@sdr.hu> | ||||
|         updater = SdrHuUpdater() | ||||
|         updater.start() | ||||
|  | ||||
|     ServiceManager.getSharedInstance().start() | ||||
|     Services.start() | ||||
|  | ||||
|     server = ThreadedHttpServer(("0.0.0.0", pm.getPropertyValue("web_port")), RequestHandler) | ||||
|     server.serve_forever() | ||||
|   | ||||
| @@ -205,16 +205,9 @@ class AprsHandler(object): | ||||
|         pass | ||||
|  | ||||
|  | ||||
| class ServiceManager(object): | ||||
|     sharedInstance = None | ||||
|  | ||||
| class Services(object): | ||||
|     @staticmethod | ||||
|     def getSharedInstance(): | ||||
|         if ServiceManager.sharedInstance is None: | ||||
|             ServiceManager.sharedInstance = ServiceManager() | ||||
|         return ServiceManager.sharedInstance | ||||
|  | ||||
|     def start(self): | ||||
|     def start(): | ||||
|         if not PropertyManager.getSharedInstance()["services_enabled"]: | ||||
|             return | ||||
|         for source in SdrService.getSources().values(): | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Jakob Ketterl
					Jakob Ketterl