Commit 249738aa by Szeberényi Imre

linux fix

parent 3e55a476
......@@ -18,6 +18,10 @@ VM kontextualizálását végzi. A felhő menedzserrel egy virtuális soros vona
- sudo apt install python3
- sudo apt install virtualenvwrapper
- sudo apt install ifupdown # elvileg együtt tud élni a Network Managerrel
* A függőségek telepítéséhez szükség lehet még a következőkre: *build-essential, gcc, g++, make, python3-dev*, valamint a *pip/setuptools/wheel* frissítésére:
- apt-get install build-essential gcc g++ make
- apt-get install python3-dev
- python -m pip install -U pip setuptools wheel
* Majd:
```
sudo -i
......
......@@ -6,7 +6,7 @@ import logging
import sys
from os.path import join
from os import environ
from utils import setup_logging
from setup_logging import setup_logging
from windows.winutils import update_component, create_autostart_task
from notify import run_client, get_temp_dir
......
......@@ -13,7 +13,7 @@ import win32event
import win32service
import win32serviceutil
from utils import setup_logging
from setup_logging import setup_logging
from windows.winutils import(
getRegistryVal, get_windows_version,
update_component, update_service_binpath
......
......@@ -11,7 +11,7 @@ from shutil import rmtree
from logging.handlers import TimedRotatingFileHandler
from pathlib import Path
from utils import setup_logging
from setup_logging import setup_logging
workdir = r"C:\circle"
comp_name = "circle-agent"
......
......@@ -96,7 +96,7 @@ class BaseContext(object):
@staticmethod
def postUpdate():
return false
return False
@staticmethod
def change_password(password):
......
#
# setup_logging.py
#
import sys
import logging
from logging.handlers import TimedRotatingFileHandler
logger = logging.getLogger(__name__)
def setup_logging(logfile=None, backup_count=3):
logger = logging.getLogger()
logger.handlers.clear()
formatter = logging.Formatter(
"[%(asctime)s] %(levelname)s [agent %(process)d/%(thread)d] "
"%(module)s.%(funcName)s:%(lineno)d] %(message)s",
"%d/%b/%Y %H:%M:%S",
)
if logfile != None:
handler = TimedRotatingFileHandler(
filename=logfile,
when="midnight",
backupCount=backup_count,
encoding="utf-8",
delay=True,
)
else:
handler = logging.StreamHandler(sys.stderr)
# Avoid duplicate handlers if setup called multiple times
logger.handlers.clear()
handler.setFormatter(formatter)
logger.addHandler(handler)
return logger
......@@ -16,58 +16,6 @@ except NameError:
logger = logging.getLogger(__name__)
system = platform.system()
def setup_logging(logfile=None, backup_count=3):
logger = logging.getLogger()
logger.handlers.clear()
formatter = logging.Formatter(
"[%(asctime)s] %(levelname)s [agent %(process)d/%(thread)d] "
"%(module)s.%(funcName)s:%(lineno)d] %(message)s",
"%d/%b/%Y %H:%M:%S",
)
if logfile != None:
handler = TimedRotatingFileHandler(
filename=logfile,
when="midnight",
backupCount=backup_count,
encoding="utf-8",
delay=True,
)
else:
handler = logging.StreamHandler(sys.stderr)
handler.setFormatter(formatter)
logger.addHandler(handler)
return logger
def setup_logging_timed(logfile: str, level: str, backup_count: int):
handler = TimedRotatingFileHandler(
filename=str(log_path),
when="midnight",
interval=1,
backupCount=backup_count,
encoding="utf-8",
utc=False, # use local time (Budapest)
delay=True, # create file only when first log is emitted
)
formatter = logging.Formatter(
format="[%(asctime)s] %(levelname)s [agent %(process)d/%(thread)d] "
"%(module)s.%(funcName)s:%(lineno)d] %(message)s",
datefmt="%d/%b/%Y %H:%M:%S",
)
handler.setFormatter(formatter)
root = logging.getLogger()
root.setLevel(level)
# Avoid duplicate handlers if setup called multiple times
root.handlers.clear()
root.addHandler(handler)
return root
class SerialLineReceiverBase(LineReceiver, object):
MAX_LENGTH = 1024*1024*128
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment