mirror of https://github.com/MISP/misp-dashboard
Moved helper scripts in their folder + updated import path
parent
b59827591d
commit
bdef0c21e9
|
@ -10,7 +10,7 @@ import logging
|
||||||
import redis
|
import redis
|
||||||
|
|
||||||
import util
|
import util
|
||||||
import users_helper
|
from . import users_helper
|
||||||
KEYDAY = "CONTRIB_DAY" # To be used by other module
|
KEYDAY = "CONTRIB_DAY" # To be used by other module
|
||||||
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
|
@ -5,7 +5,7 @@ import datetime, time
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import util
|
import util
|
||||||
import contributor_helper
|
from . import contributor_helper
|
||||||
|
|
||||||
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
|
@ -11,10 +11,10 @@ import os
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import util
|
import util
|
||||||
import geo_helper
|
from helpers import geo_helper
|
||||||
import contributor_helper
|
from helpers import contributor_helper
|
||||||
import users_helper
|
from helpers import users_helper
|
||||||
import trendings_helper
|
from helpers import trendings_helper
|
||||||
|
|
||||||
configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg')
|
configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg')
|
||||||
cfg = configparser.ConfigParser()
|
cfg = configparser.ConfigParser()
|
||||||
|
|
|
@ -13,17 +13,17 @@ import sys
|
||||||
import json
|
import json
|
||||||
|
|
||||||
import util
|
import util
|
||||||
import geo_helper
|
from helpers import geo_helper
|
||||||
import contributor_helper
|
from helpers import contributor_helper
|
||||||
import users_helper
|
from helpers import users_helper
|
||||||
import trendings_helper
|
from helpers import trendings_helper
|
||||||
|
|
||||||
configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg')
|
configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg')
|
||||||
cfg = configparser.ConfigParser()
|
cfg = configparser.ConfigParser()
|
||||||
cfg.read(configfile)
|
cfg.read(configfile)
|
||||||
|
|
||||||
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger('zmq_dispatcher')
|
||||||
|
|
||||||
CHANNEL = cfg.get('RedisLog', 'channel')
|
CHANNEL = cfg.get('RedisLog', 'channel')
|
||||||
LISTNAME = cfg.get('RedisLIST', 'listName')
|
LISTNAME = cfg.get('RedisLIST', 'listName')
|
||||||
|
|
|
@ -15,7 +15,7 @@ cfg = configparser.ConfigParser()
|
||||||
cfg.read(configfile)
|
cfg.read(configfile)
|
||||||
|
|
||||||
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
logging.basicConfig(filename='logs/logs.log', filemode='w', level=logging.INFO)
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger('zmq_subscriber')
|
||||||
|
|
||||||
ZMQ_URL = cfg.get('RedisGlobal', 'zmq_url')
|
ZMQ_URL = cfg.get('RedisGlobal', 'zmq_url')
|
||||||
CHANNEL = cfg.get('RedisLog', 'channel')
|
CHANNEL = cfg.get('RedisLog', 'channel')
|
||||||
|
|
Loading…
Reference in New Issue