mirror of https://github.com/MISP/misp-dashboard
Merge pull request #109 from MISP/fixlogs
fix: [logs:helper] Helpers get their own log filepull/111/head
commit
beb17f7b56
|
@ -39,12 +39,16 @@ class Contributor_helper:
|
||||||
if not os.path.exists(logDir):
|
if not os.path.exists(logDir):
|
||||||
os.makedirs(logDir)
|
os.makedirs(logDir)
|
||||||
try:
|
try:
|
||||||
logging.basicConfig(filename=logPath, filemode='a', level=logging.INFO)
|
handler = logging.FileHandler(logPath)
|
||||||
except PermissionError as error:
|
except PermissionError as error:
|
||||||
print(error)
|
print(error)
|
||||||
print("Please fix the above and try again.")
|
print("Please fix the above and try again.")
|
||||||
sys.exit(126)
|
sys.exit(126)
|
||||||
|
formatter = logging.Formatter('%(asctime)s:%(levelname)s:%(name)s:%(message)s')
|
||||||
|
handler.setFormatter(formatter)
|
||||||
self.logger = logging.getLogger(__name__)
|
self.logger = logging.getLogger(__name__)
|
||||||
|
self.logger.setLevel(logging.INFO)
|
||||||
|
self.logger.addHandler(handler)
|
||||||
|
|
||||||
#honorBadge
|
#honorBadge
|
||||||
self.honorBadgeNum = len(self.cfg_org_rank.options('HonorBadge'))
|
self.honorBadgeNum = len(self.cfg_org_rank.options('HonorBadge'))
|
||||||
|
|
|
@ -38,12 +38,16 @@ class Geo_helper:
|
||||||
if not os.path.exists(logDir):
|
if not os.path.exists(logDir):
|
||||||
os.makedirs(logDir)
|
os.makedirs(logDir)
|
||||||
try:
|
try:
|
||||||
logging.basicConfig(filename=logPath, filemode='a', level=logging.INFO)
|
handler = logging.FileHandler(logPath)
|
||||||
except PermissionError as error:
|
except PermissionError as error:
|
||||||
print(error)
|
print(error)
|
||||||
print("Please fix the above and try again.")
|
print("Please fix the above and try again.")
|
||||||
sys.exit(126)
|
sys.exit(126)
|
||||||
|
formatter = logging.Formatter('%(asctime)s:%(levelname)s:%(name)s:%(message)s')
|
||||||
|
handler.setFormatter(formatter)
|
||||||
self.logger = logging.getLogger(__name__)
|
self.logger = logging.getLogger(__name__)
|
||||||
|
self.logger.setLevel(logging.INFO)
|
||||||
|
self.logger.addHandler(handler)
|
||||||
|
|
||||||
self.keyCategCoord = "GEO_COORD"
|
self.keyCategCoord = "GEO_COORD"
|
||||||
self.keyCategCountry = "GEO_COUNTRY"
|
self.keyCategCountry = "GEO_COUNTRY"
|
||||||
|
|
|
@ -23,12 +23,16 @@ class Live_helper:
|
||||||
if not os.path.exists(logDir):
|
if not os.path.exists(logDir):
|
||||||
os.makedirs(logDir)
|
os.makedirs(logDir)
|
||||||
try:
|
try:
|
||||||
logging.basicConfig(filename=logPath, filemode='a', level=logging.INFO)
|
handler = logging.FileHandler(logPath)
|
||||||
except PermissionError as error:
|
except PermissionError as error:
|
||||||
print(error)
|
print(error)
|
||||||
print("Please fix the above and try again.")
|
print("Please fix the above and try again.")
|
||||||
sys.exit(126)
|
sys.exit(126)
|
||||||
|
formatter = logging.Formatter('%(asctime)s:%(levelname)s:%(name)s:%(message)s')
|
||||||
|
handler.setFormatter(formatter)
|
||||||
self.logger = logging.getLogger(__name__)
|
self.logger = logging.getLogger(__name__)
|
||||||
|
self.logger.setLevel(logging.INFO)
|
||||||
|
self.logger.addHandler(handler)
|
||||||
|
|
||||||
def publish_log(self, zmq_name, name, content, channel=None):
|
def publish_log(self, zmq_name, name, content, channel=None):
|
||||||
channel = channel if channel is not None else self.CHANNEL
|
channel = channel if channel is not None else self.CHANNEL
|
||||||
|
|
|
@ -32,12 +32,16 @@ class Trendings_helper:
|
||||||
if not os.path.exists(logDir):
|
if not os.path.exists(logDir):
|
||||||
os.makedirs(logDir)
|
os.makedirs(logDir)
|
||||||
try:
|
try:
|
||||||
logging.basicConfig(filename=logPath, filemode='a', level=logging.INFO)
|
handler = logging.FileHandler(logPath)
|
||||||
except PermissionError as error:
|
except PermissionError as error:
|
||||||
print(error)
|
print(error)
|
||||||
print("Please fix the above and try again.")
|
print("Please fix the above and try again.")
|
||||||
sys.exit(126)
|
sys.exit(126)
|
||||||
|
formatter = logging.Formatter('%(asctime)s:%(levelname)s:%(name)s:%(message)s')
|
||||||
|
handler.setFormatter(formatter)
|
||||||
self.logger = logging.getLogger(__name__)
|
self.logger = logging.getLogger(__name__)
|
||||||
|
self.logger.setLevel(logging.INFO)
|
||||||
|
self.logger.addHandler(handler)
|
||||||
|
|
||||||
''' SETTER '''
|
''' SETTER '''
|
||||||
|
|
||||||
|
|
|
@ -29,12 +29,16 @@ class Users_helper:
|
||||||
if not os.path.exists(logDir):
|
if not os.path.exists(logDir):
|
||||||
os.makedirs(logDir)
|
os.makedirs(logDir)
|
||||||
try:
|
try:
|
||||||
logging.basicConfig(filename=logPath, filemode='a', level=logging.INFO)
|
handler = logging.FileHandler(logPath)
|
||||||
except PermissionError as error:
|
except PermissionError as error:
|
||||||
print(error)
|
print(error)
|
||||||
print("Please fix the above and try again.")
|
print("Please fix the above and try again.")
|
||||||
sys.exit(126)
|
sys.exit(126)
|
||||||
|
formatter = logging.Formatter('%(asctime)s:%(levelname)s:%(name)s:%(message)s')
|
||||||
|
handler.setFormatter(formatter)
|
||||||
self.logger = logging.getLogger(__name__)
|
self.logger = logging.getLogger(__name__)
|
||||||
|
self.logger.setLevel(logging.INFO)
|
||||||
|
self.logger.addHandler(handler)
|
||||||
|
|
||||||
def add_user_login(self, timestamp, org, email=''):
|
def add_user_login(self, timestamp, org, email=''):
|
||||||
timestampDate = datetime.datetime.fromtimestamp(float(timestamp))
|
timestampDate = datetime.datetime.fromtimestamp(float(timestamp))
|
||||||
|
|
Loading…
Reference in New Issue