diff options
| -rw-r--r-- | service/pixelated/runserver.py | 1 | ||||
| -rw-r--r-- | service/pixelated/support/ext_sqlcipher.py | 24 | ||||
| -rw-r--r-- | service/test/unit/runserver_test.py | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/service/pixelated/runserver.py b/service/pixelated/runserver.py index ebcdc622..7a67fa8e 100644 --- a/service/pixelated/runserver.py +++ b/service/pixelated/runserver.py @@ -25,6 +25,7 @@ import pixelated.config.credentials_prompt as credentials_prompt import pixelated.bitmask_libraries.register as leap_register import pixelated.config.reactor_manager as reactor_manager import pixelated.support.ext_protobuf # monkey patch for protobuf in OSX +import pixelated.support.ext_sqlcipher # monkey patch for sqlcipher in debian from twisted.internet import error diff --git a/service/pixelated/support/ext_sqlcipher.py b/service/pixelated/support/ext_sqlcipher.py new file mode 100644 index 00000000..41e323a7 --- /dev/null +++ b/service/pixelated/support/ext_sqlcipher.py @@ -0,0 +1,24 @@ +# +# Copyright (c) 2014 ThoughtWorks, Inc. +# +# Pixelated is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pixelated is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + +import leap.soledad.client.sqlcipher +from sys import platform as _platform + + +# WAL is breaking for the debian sqlcipher package so we need to disable it +# refer to https://leap.se/code/issues/5562 +if _platform == 'linux2': + leap.soledad.client.sqlcipher.SQLCipherDatabase._pragma_write_ahead_logging = lambda x, y: None
\ No newline at end of file diff --git a/service/test/unit/runserver_test.py b/service/test/unit/runserver_test.py index eed21a6c..80cbf543 100644 --- a/service/test/unit/runserver_test.py +++ b/service/test/unit/runserver_test.py @@ -21,7 +21,6 @@ import pixelated.runserver from mockito import * import pixelated.config.reactor_manager as reactor_manager import pixelated.adapter.mail -import os import pixelated.config.app_factory as app_factory |