Permalink
Browse files

Merge branch 'master' of github.com:naparuba/shinken

  • Loading branch information...
2 parents b3c5960 + 65519f2 commit 3e9ae1975595b630a0d17f5746f317ecaf904044 @naparuba committed Aug 31, 2012
Showing with 10 additions and 1 deletion.
  1. +4 −0 shinken/modules/logstore_mongodb.py
  2. +4 −0 shinken/modules/logstore_sqlite.py
  3. +2 −1 shinken/pyro_wrapper.py
View
4 shinken/modules/logstore_mongodb.py
@@ -189,6 +189,10 @@ def commit_and_rotate_log_db(self):
def manage_log_brok(self, b):
data = b.data
line = data['log']
+ if re.match("^\[[0-9]*\] [A-Z][a-z]*.:", line):
+ # Match log which NOT have to be stored
+ # print "Unexpected in manage_log_brok", line
+ return
logline = Logline(line=line)
values = logline.as_dict()
if logline.logclass != LOGCLASS_INVALID:
View
4 shinken/modules/logstore_sqlite.py
@@ -406,6 +406,10 @@ def manage_log_brok(self, b):
return
data = b.data
line = data['log']
+ if re.match("^\[[0-9]*\] [A-Z][a-z]*.:", line):
+ # Match log which NOT have to be stored
+ # print "Unexpected in manage_log_brok", line
+ return
try:
logline = Logline(line=line)
values = logline.as_tuple()
View
3 shinken/pyro_wrapper.py
@@ -150,6 +150,7 @@ def shutdown(con):
# Version not supported for now, we have to work on it
bad_versions = []
+ last_known_working_version = "4.14"
msg_waitall_issue_versions = ["4.1", "4.2", "4.3", "4.4", "4.5", "4.6", "4.7", '4.8',
'4.9', '4.10', '4.11', '4.12', '4.13']
@@ -179,7 +180,7 @@ def __init__(self, host, port, use_ssl=False):
if PYRO_VERSION in old_versions:
Pyro.config.SERVERTYPE = "select"
elif PYRO_VERSION in bad_versions:
- logger.error("Your pyro version (%s) is not supported. Please downgrade it (4.12)" % PYRO_VERSION)
+ logger.error("Your pyro version (%s) is not supported. Please install version (%s) " % (PYRO_VERSION, last_known_working_version))
exit(1)
else:
Pyro.config.SERVERTYPE = "multiplex"

0 comments on commit 3e9ae19

Please sign in to comment.