Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for connection to remote mongodb #23

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Support for connection to remote mongodb #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
42a9e3e
Added support for connection to remote mongodb.
standa4 Jan 11, 2016
c7e1828
bug fix
standa4 Jan 20, 2016
df0fd49
added default values for mongodb host and port
standa4 Jan 26, 2016
b36a6ea
reworked assigning default values for config of mongo host and port -…
standa4 Feb 24, 2016
1e12b91
mongo database config renamed to old style -> support for old version…
standa4 Feb 24, 2016
b299d82
added support for authentication (mongodb)
standa4 Apr 12, 2016
37f407f
bug fix
standa4 Apr 29, 2016
0421203
bug fix
standa4 May 25, 2016
4a97e29
Merge remote-tracking branch 'upstream/master'
standa4 Aug 22, 2016
ee40faf
using env variables instead of using config file for mongodb settings
standa4 Aug 24, 2016
9ac99e1
bug fix
standa4 Sep 1, 2016
b29ba63
convert MONGO_PORT variable to int value
standa4 Sep 1, 2016
b13fd28
Merge remote-tracking branch 'upstream/master'
standa4 Jun 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mnemosyne.cfg.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ host = 0.0.0.0
port = 8181

[mongodb]
host = 127.0.0.1
port = 27017
database = mnemosyne

[hpfriends]
Expand Down
6 changes: 3 additions & 3 deletions persistance/mnemodb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@


class MnemoDB(object):
def __init__(self, database_name):
def __init__(self, mongo_host, mongo_port, database_name):
logger.info('Connecting to mongodb, using "{0}" as database.'.format(database_name))
conn = MongoClient(auto_start_request=False)
self.rg = ReportGenerator(database_name)
conn = MongoClient(host=mongo_host, port=mongo_port, auto_start_request=False)
self.rg = ReportGenerator(mongo_host, mongo_port, database_name)
self.db = conn[database_name]
self.ensure_index()

Expand Down
4 changes: 2 additions & 2 deletions persistance/preagg_reports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class ReportGenerator:
Generates pre-aggregated reports.
"""

def __init__(self, database_name):
def __init__(self, mongo_host, mongo_port, database_name):
logger.info('Connecting to mongodb, using "{0}" as database.'.format(database_name))
conn = MongoClient(w=0)
conn = MongoClient(host=mongo_host, port=mongo_port, w=0)
self.db = conn[database_name]

def hpfeeds(self, entry):
Expand Down
4 changes: 3 additions & 1 deletion runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ def parse_config(config_file):
config['loggly_token'] = parser.get('loggly_log', 'token')

config['mongo_db'] = parser.get('mongodb', 'database')
config['mongo_host'] = parser.get('mongodb', 'host')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should have default values so people could still use the old mnemosyne config.

config['mongo_port'] = parser.get('mongodb', 'port')

config['hpf_feeds'] = parser.get('hpfriends', 'channels').split(',')
config['hpf_ident'] = parser.get('hpfriends', 'ident')
Expand Down Expand Up @@ -113,7 +115,7 @@ def do_logging(file_log=None, loggly_token=None):

greenlets = {}

db = mnemodb.MnemoDB(c['mongo_db'])
db = mnemodb.MnemoDB(c['mongo_host'], c['mongo_port'], c['mongo_db'])

webapi = None
hpfriends_puller = None
Expand Down