MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fixlogs'

pull/135/head
mokaddem 2019-06-27 11:06:21 +02:00
parent 6b064732fd 7e44e00788
commit b7d8259a73
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helpers/contributor_helper.py
View File

@ -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'))

6
helpers/geo_helper.py
View File

@ -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"

6
helpers/live_helper.py
View File

@ -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

6
helpers/trendings_helper.py
View File

@ -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 '''

6
helpers/users_helper.py
View File

@ -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))