From 91e4481c450eb7eb928debc1cb7fa59bdb63dd7b Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 25 Jul 2017 11:40:11 -0400
Subject: [pkg] packaging and path changes

- move all the pixelated python package under src/
- move the pixelated_www package under the leap namespace
- allow to set globally the static folder
- add hours and minutes to the timestamp in package version, to allow
  for several releases a day.
---
 service/pixelated/config/logger.py | 55 --------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 service/pixelated/config/logger.py

(limited to 'service/pixelated/config/logger.py')

diff --git a/service/pixelated/config/logger.py b/service/pixelated/config/logger.py
deleted file mode 100644
index bc4ab8d4..00000000
--- a/service/pixelated/config/logger.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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 logging
-import os
-import sys
-import time
-from twisted.logger import globalLogBeginner, FileLogObserver
-
-
-class PrivateKeyFilter(logging.Filter):
-
-    def filter(self, record):
-        if '-----BEGIN PGP PRIVATE KEY BLOCK-----' in record.msg:
-            record.msg = '*** private key removed by %s.%s ***' % (type(self).__module__, type(self).__name__)
-        return True
-
-
-def init(debug=False):
-    debug_enabled = debug or os.environ.get('DEBUG', False)
-    logging_level = logging.DEBUG if debug_enabled else logging.INFO
-
-    logging.basicConfig(level=logging_level,
-                        format='%(asctime)s [%(name)s] %(levelname)s %(message)s',
-                        datefmt='%Y-%m-%d %H:%M:%S',
-                        filemode='a')
-
-    logging.getLogger('gnupg').setLevel(logging.WARN)
-    logging.getLogger('gnupg').addFilter(PrivateKeyFilter())
-
-    def formatter(event):
-        try:
-            event['log_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(event['log_time']))
-            event['log_level'] = event['log_level'].name.upper()
-            event['log_format'] = str(event['log_format']) + '\n' if event.get('log_format') else ''
-            logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format']
-            return logstring.format(**event)
-        except Exception as e:
-            return "Error while formatting log event: {!r}\nOriginal event: {!r}\n".format(e, event)
-
-    observers = [FileLogObserver(sys.stdout, formatter)]
-    globalLogBeginner.beginLoggingTo(observers)
-- 
cgit v1.2.3