summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-11-27 12:02:27 -0200
committerdrebs <drebs@leap.se>2016-11-27 12:02:27 -0200
commitf072f18f317ea31e66c7890d672b5d2fd9f3ef14 (patch)
treedb18a701bbefdb9a5e71f814f5ff1263c2fa821d /common/src/leap/soledad
parent564f55802455d08c9a38e892bb4b25ad6fbcb87d (diff)
parentdff666e51240393ebbf2a2118e6e51130fe91f8c (diff)
Merge tag '0.9.1'
Tag version 0.9.1 # gpg: Signature made Sun 27 Nov 2016 12:01:10 PM BRST # gpg: using RSA key 0x6071E70DCACC60B2 # gpg: a verificar a base de dados de confiança # gpg: public key of ultimately trusted key 0x030F1C082D2327BE not found # gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model # gpg: depth: 0 valid: 11 signed: 71 trust: 0-, 0q, 0n, 0m, 0f, 11u # gpg: depth: 1 valid: 71 signed: 64 trust: 69-, 0q, 0n, 0m, 2f, 0u # gpg: depth: 2 valid: 55 signed: 74 trust: 55-, 0q, 0n, 0m, 0f, 0u # gpg: proxima verificação da base de dados de confiança a 2016-12-12 # gpg: Good signature from "drebs (work key) <db@leap.se>" [ultimate] # gpg: aka "drebs (work key) <drebs@leap.se>" [ultimate] # Impressão da chave primária: 9F73 295B 6306 E06F 3151 99AE 6071 E70D CACC 60B2
Diffstat (limited to 'common/src/leap/soledad')
-rw-r--r--common/src/leap/soledad/common/couch/state.py5
-rw-r--r--common/src/leap/soledad/common/log.py40
2 files changed, 44 insertions, 1 deletions
diff --git a/common/src/leap/soledad/common/couch/state.py b/common/src/leap/soledad/common/couch/state.py
index 523ac0b0..a7f5b7b6 100644
--- a/common/src/leap/soledad/common/couch/state.py
+++ b/common/src/leap/soledad/common/couch/state.py
@@ -101,10 +101,15 @@ class CouchServerState(ServerState):
config_doc = db.get(CONFIG_DOC_ID)
if config_doc:
if config_doc[SCHEMA_VERSION_KEY] != SCHEMA_VERSION:
+ logger.error(
+ "Unsupported database schema in database %s" % dbname)
raise WrongCouchSchemaVersionError(dbname)
else:
result = db.view('_all_docs', limit=1)
if result.total_rows != 0:
+ logger.error(
+ "Missing couch config document in database %s"
+ % dbname)
raise MissingCouchConfigDocumentError(dbname)
def open_database(self, dbname):
diff --git a/common/src/leap/soledad/common/log.py b/common/src/leap/soledad/common/log.py
index 3f026045..59a47726 100644
--- a/common/src/leap/soledad/common/log.py
+++ b/common/src/leap/soledad/common/log.py
@@ -25,9 +25,47 @@ to stdout, mainly for development purposes.
import os
import sys
+import time
from twisted.logger import Logger
from twisted.logger import textFileLogObserver
+from twisted.logger import LogLevel
+from twisted.logger import InvalidLogLevelError
+from twisted.python.failure import Failure
+
+
+# What follows is a patched class to correctly log namespace and level when
+# using the default formatter and --syslog option in twistd. This seems to be a
+# known bug but it has not been reported to upstream yet.
+
+class SyslogLogger(Logger):
+
+ def emit(self, level, format=None, **kwargs):
+ if level not in LogLevel.iterconstants():
+ self.failure(
+ "Got invalid log level {invalidLevel!r} in {logger}.emit().",
+ Failure(InvalidLogLevelError(level)),
+ invalidLevel=level,
+ logger=self,
+ )
+ return
+
+ event = kwargs
+ event.update(
+ log_logger=self, log_level=level, log_namespace=self.namespace,
+ log_source=self.source, log_format=format, log_time=time.time(),
+ )
+
+ # ---------------------------------8<---------------------------------
+ # this is a workaround for the mess between twisted's legacy log system
+ # and twistd's --syslog option.
+ event["system"] = "%s#%s" % (self.namespace, level.name)
+ # ---------------------------------8<---------------------------------
+
+ if "log_trace" in event:
+ event["log_trace"].append((self, self.observer))
+
+ self.observer(event)
def getLogger(*args, **kwargs):
@@ -39,7 +77,7 @@ def getLogger(*args, **kwargs):
if os.environ.get('SOLEDAD_LOG_TO_STDOUT'):
kwargs({'observer': textFileLogObserver(sys.stdout)})
- return Logger(*args, **kwargs)
+ return SyslogLogger(*args, **kwargs)
__all__ = ['getLogger']