You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/12/14 19:27:26 UTC

allura git commit: Better debugging with docker

Repository: allura
Updated Branches:
  refs/heads/master 7a2ff28ca -> 7eee12cf8


Better debugging with docker


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7eee12cf
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7eee12cf
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7eee12cf

Branch: refs/heads/master
Commit: 7eee12cf82886f9dc891e724bf149f63166bc6c6
Parents: 7a2ff28
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Nov 18 17:52:40 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Dec 14 14:27:17 2016 -0500

----------------------------------------------------------------------
 AlluraTest/alluratest/smtp_debug.py | 27 +++++++++++++++++++++++++++
 docker-compose.yml                  |  5 ++++-
 requirements.txt                    |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/7eee12cf/AlluraTest/alluratest/smtp_debug.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/smtp_debug.py b/AlluraTest/alluratest/smtp_debug.py
new file mode 100644
index 0000000..08a0108
--- /dev/null
+++ b/AlluraTest/alluratest/smtp_debug.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+#       Licensed to the Apache Software Foundation (ASF) under one
+#       or more contributor license agreements.  See the NOTICE file
+#       distributed with this work for additional information
+#       regarding copyright ownership.  The ASF licenses this file
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#       KIND, either express or implied.  See the License for the
+#       specific language governing permissions and limitations
+#       under the License.
+
+from smtpd import DebuggingServer
+
+
+class BetterDebuggingServer(DebuggingServer, object):
+
+    def process_message(self, peer, mailfrom, rcpttos, data):
+        print 'TO: ' + ', '.join(rcpttos)
+        super(BetterDebuggingServer, self).process_message(peer, mailfrom, rcpttos, data)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/allura/blob/7eee12cf/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index ed19004..7064b68 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,10 @@ mongo:
 
 outmail:
   image: allura_web
-  command: python -u -m smtpd -n -c DebuggingServer 0.0.0.0:8826
+  environment: *env
+  volumes_from:
+    - web
+  command: python -u -m smtpd -n -c alluratest.smtp_debug.BetterDebuggingServer 0.0.0.0:8826
   expose:
     - "8826"
 

http://git-wip-us.apache.org/repos/asf/allura/blob/7eee12cf/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 1d8dffd..13d091c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -98,4 +98,4 @@ sphinx-rtd-theme==0.1.6
 sphinxcontrib-programoutput==0.8
 
 # deployment
-gunicorn==19.3.0
+gunicorn==19.4.5