linspector/uplink
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed support for bottle and pyramid. cherrypy is most easy to integrate and fits to all my needs...

Browse source
This commit is contained in:
Johannes Findeisen 2022-08-28 04:56:33 +02:00
commit c8bde6f22b
2 changed files with 9 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
bin/uplink
View file

@ -172,24 +172,10 @@ def main():
elif args.foreground: elif args.foreground:
from threading import Thread from threading import Thread
if configuration.get_env_var('_server'): if configuration.get_env_var('_server'):
if configuration.get_httpserver_framework() == 'bottle': from uplink.server_cherrypy import Server
from uplink.server_bottle import Server s = Server(configuration)
s = Server(configuration) st = Thread(target=s.run_server, daemon=True)
st = Thread(target=s.run_server, daemon=True) st.start()
st.start()
elif configuration.get_httpserver_framework() == 'cherrypy':
from uplink.server_cherrypy import Server
s = Server(configuration)
st = Thread(target=s.run_server, daemon=True)
st.start()
elif configuration.get_httpserver_framework() == 'pyramid':
from uplink.server_pyramid import Server
s = Server(configuration)
st = Thread(target=s.run_server, daemon=True)
st.start()
else:
logger.error('[uplink] no http framework configured! '
'(bottle, cherrypy and pyramid are supported)')
while True: while True:
for i in range(len(configuration.get_uplinks())): for i in range(len(configuration.get_uplinks())):

20
uplink/uplink.py
View file

@ -95,21 +95,11 @@ class Uplink(Daemon):
def run(self): def run(self):
if self.configuration.get_env_var('_server'): if self.configuration.get_env_var('_server'):
if self.configuration.get_httpserver_framework() == 'bottle': from uplink.server_cherrypy import Server
from uplink.server_bottle import Server s = Server(self.configuration)
s = Server(self.configuration) st = Thread(target=s.run_server, daemon=True)
st = Thread(target=s.run_server, daemon=True) st.start()
st.start()
elif self.configuration.get_httpserver_framework() == 'cherrypy':
from uplink.server_cherrypy import Server
s = Server(self.configuration)
st = Thread(target=s.run_server, daemon=True)
st.start()
elif self.configuration.get_httpserver_framework() == 'pyramid':
from uplink.server_pyramid import Server
s = Server(self.configuration)
st = Thread(target=s.run_server, daemon=True)
st.start()
while True: while True:
for i in range(len(self.configuration.get_uplinks())): for i in range(len(self.configuration.get_uplinks())):
ut = Thread(target=self.fetch_data, daemon=True, args=(i,)) ut = Thread(target=self.fetch_data, daemon=True, args=(i,))