shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-23 17:34:17 +03:00
Code Issues Releases Wiki Activity

Fixed makefile

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-02-17 12:01:48 +01:00
parent d33e5e3a1e
commit e13c8a93b3
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actor/linux/Makefile
View File

@ -16,7 +16,7 @@ XDGAUTOSTARTDIR := $(DESTDIR)/etc/xdg/autostart
KDEAUTOSTARTDIR := $(DESTDIR)/usr/share/autostart
PYC := $(shell find $(SOURCEDIR) -name '*.py[co]')
CACHES := $(shell find $(SOURCEDIR) -name '__pycache__')
CACHES := $(shell find $(SOURCEDIR) -name '__pycache__' -o -name '.mypy_cache')
clean:
rm -rf $(PYC) $(CACHES) $(DESTDIR)

7
actor/src/udsactor/rest.py
View File

@ -248,7 +248,12 @@ class UDSServerApi(UDSApi):
def login(self, own_token: str, username: str) -> types.LoginResultInfoType:
if not own_token:
return
return types.LoginResultInfoType(
ip='0.0.0.0',
hostname='unknown',
dead_line=None,
max_idle=None
)
payload = {
'token': own_token,
'username': username

8
actor/src/udsactor/service.py
View File

@ -40,7 +40,7 @@ from . import platform
from . import rest
from . import types
from .log import logger
from .log import logger, DEBUG, INFO, ERROR, FATAL
from .http import clients_pool, server
# def setup() -> None:
@ -89,7 +89,11 @@ class CommonService: # pylint: disable=too-many-instance-attributes
self._http = None
# Initialzies loglevel and serviceLogger
logger.setLevel(self._cfg.log_level * 10000)
# 0 = DEBUG, 1 = INFO, 2 = ERROR, 3 = FATAL in combobox
# BUT!!!:
# 0 = OTHER, 10000 = DEBUG, 20000 = WARN, 30000 = INFO, 40000 = ERROR, 50000 = FATAL
# So this comes:
logger.setLevel([DEBUG, INFO, ERROR, FATAL][self._cfg.log_level])
# If windows, enable service logger
logger.enableServiceLogger()