ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-05 09:53:33 +03:00
Code Issues Projects Releases Wiki Activity

dashboard, hotkey, protocol: Use EDMCLogging.get_main_logger()

Browse Source 
It does the EDMC/EDMarketConnector check.
This commit is contained in:
Athanasius 2020-10-14 11:53:47 +01:00
parent 9be7f14573
commit abfde73362
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dashboard.py
View File

@ -1,18 +1,12 @@
import json import json
import logging
from calendar import timegm
from os import getenv
from os.path import isdir, isfile, join, getsize from os.path import isdir, isfile, join, getsize
from sys import platform from sys import platform
import time import time
from config import appcmdname, appname, config from config import config
from EDMCLogging import get_main_logger
if getenv("EDMC_NO_UI"): logger = get_main_logger()
logger = logging.getLogger(appcmdname)
else:
logger = logging.getLogger(appname)
if platform=='darwin': if platform=='darwin':
from watchdog.observers import Observer from watchdog.observers import Observer

11
hotkey.py
View File

@ -1,17 +1,12 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import logging
from os import getenv
from os.path import join from os.path import join
from sys import platform from sys import platform
from config import appcmdname, appname, config from config import config
from EDMCLogging import get_main_logger
if getenv("EDMC_NO_UI"): logger = get_main_logger()
logger = logging.getLogger(appcmdname)
else:
logger = logging.getLogger(appname)
if platform == 'darwin': if platform == 'darwin':

12
protocol.py
View File

@ -1,19 +1,13 @@
# edmc: protocol handler for cAPI authorisation # edmc: protocol handler for cAPI authorisation
import logging
import threading import threading
import urllib.request, urllib.error, urllib.parse import urllib.request, urllib.error, urllib.parse
import sys import sys
from os import getenv
from config import appname, appcmdname from EDMCLogging import get_main_logger
if getenv("EDMC_NO_UI"): logger = get_main_logger()
logger = logging.getLogger(appcmdname)
else:
logger = logging.getLogger(appname)
if sys.platform == 'win32': if sys.platform == 'win32':
from ctypes import * from ctypes import *
@ -254,7 +248,7 @@ else: # Linux / Run from source
else: else:
logger.debug('No thread') logger.debug('No thread')
logger.debug('Done') logger.debug('Done.')
def worker(self): def worker(self):
self.httpd.serve_forever() self.httpd.serve_forever()