<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15382] CalendarServer/trunk/calendarserver/tap</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15382">15382</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-11 14:04:20 -0800 (Fri, 11 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure nin-ascii error log strings are properly output. Clean-up the APNS cert checking to avoid an unhandled exception.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (15381 => 15382)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py        2015-12-11 20:11:12 UTC (rev 15381)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py        2015-12-11 22:04:20 UTC (rev 15382)
</span><span class="lines">@@ -257,11 +257,17 @@
</span><span class="cx"> )
</span><span class="cx"> if self.logRotateOnStart:
</span><span class="cx"> errorLogFile.rotate()
</span><ins>+ encoding = "utf-8"
</ins><span class="cx"> else:
</span><span class="cx"> errorLogFile = sys.stdout
</span><ins>+ encoding = sys.stdout.encoding
</ins><span class="cx"> withTime = not (not config.ErrorLogFile and config.ProcessType in ("Slave", "DPS",))
</span><span class="cx"> errorLogObserver = Logger.makeFilteredFileLogObserver(errorLogFile, withTime=withTime)
</span><span class="cx">
</span><ins>+ # We need to do this because the current Twisted logger implementation fails to setup the encoding
+ # correctly when a L{twisted.python.logile.LogFile} is passed to a {twisted.logger._file.FileLogObserver}
+ errorLogObserver._observers[0]._encoding = encoding
+
</ins><span class="cx"> # Registering ILogObserver with the Application object
</span><span class="cx"> # gets our observer picked up within AppLogger.start( )
</span><span class="cx"> app.setComponent(ILogObserver, errorLogObserver)
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_caldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py (15381 => 15382)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py        2015-12-11 20:11:12 UTC (rev 15381)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py        2015-12-11 22:04:20 UTC (rev 15382)
</span><span class="lines">@@ -40,8 +40,7 @@
</span><span class="cx"> from twisted.internet.defer import Deferred, inlineCallbacks, succeed, gatherResults
</span><span class="cx"> from twisted.internet.task import Clock
</span><span class="cx"> from twisted.internet import reactor
</span><del>-from twisted.application.service import (IService, IServiceCollection
- )
</del><ins>+from twisted.application.service import IService, IServiceCollection, Application
</ins><span class="cx"> from twisted.application import internet
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="lines">@@ -66,11 +65,11 @@
</span><span class="cx"> CalDAVOptions, CalDAVServiceMaker, CalDAVService, GroupOwnedUNIXServer,
</span><span class="cx"> DelayedStartupProcessMonitor, DelayedStartupLineLogger, TwistdSlaveProcess,
</span><span class="cx"> _CONTROL_SERVICE_NAME, getSystemIDs, PreProcessingService,
</span><del>- DataStoreMonitor
-)
</del><ins>+ DataStoreMonitor, ErrorLoggingMultiService)
</ins><span class="cx"> from calendarserver.provision.root import RootResource
</span><span class="cx"> from StringIO import StringIO
</span><span class="cx"> import tempfile
</span><ins>+from twisted.python.log import ILogObserver
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -453,6 +452,36 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class TestErrorLoggingMultiService(TestCase):
+
+ def test_nonAsciiLog(self):
+ """
+ Make sure that the file based error log can write non ascii data
+ """
+
+ logpath = self.mktemp()
+ service = ErrorLoggingMultiService(
+ True,
+ logpath,
+ 10000,
+ 10,
+ False,
+ )
+ app = Application("non-ascii")
+ service.setServiceParent(app)
+
+ observer = app.getComponent(ILogObserver, None)
+ self.assertTrue(observer is not None)
+
+ log = Logger(observer=observer)
+ log.error(u"Couldn\u2019t be wrong")
+
+ with open(logpath) as f:
+ logentry = f.read()
+ self.assertIn("Couldn\xe2\x80\x99t be wrong", logentry)
+
+
+
</ins><span class="cx"> class TestProcessMonitor(ProcessMonitor):
</span><span class="cx">
</span><span class="cx"> def startProcess(self, name):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (15381 => 15382)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py        2015-12-11 20:11:12 UTC (rev 15381)
+++ CalendarServer/trunk/calendarserver/tap/util.py        2015-12-11 22:04:20 UTC (rev 15382)
</span><span class="lines">@@ -1378,31 +1378,29 @@
</span><span class="cx"> ):
</span><span class="cx"> protoConfig = config.Notifications.Services.APNS[protocol]
</span><span class="cx">
</span><del>- # Verify the cert exists
</del><span class="cx"> if hasattr(OpenSSL, "__SecureTransport__"):
</span><span class="cx"> if protoConfig.KeychainIdentity:
</span><del>- # Verify we can extract the topic
- if not protoConfig.Topic:
- topic = getAPNTopicFromIdentity(protoConfig.KeychainIdentity)
- protoConfig.Topic = topic
- if not protoConfig.Topic:
- postAlert("PushNotificationKeychainIdentityAlert", 0, [])
- message = "Cannot extract APN topic"
- return False, message
-
- # Fall through to see if we can load the identity from the keychain
- certificate_title = "Keychain: {}".format(protoConfig.KeychainIdentity)
-
</del><ins>+ # Verify the identity exists
</ins><span class="cx"> error = OpenSSL.crypto.check_keychain_identity(protoConfig.KeychainIdentity)
</span><span class="cx"> if error:
</span><span class="cx"> message = (
</span><span class="cx"> "The {proto} APNS Keychain Identity ({cert}) cannot be used: {reason}".format(
</span><span class="cx"> proto=protocol,
</span><del>- cert=certificate_title,
</del><ins>+ cert=protoConfig.KeychainIdentity,
</ins><span class="cx"> reason=error
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> return False, message
</span><ins>+
+ # Verify we can extract the topic
+ if not protoConfig.Topic:
+ topic = getAPNTopicFromIdentity(protoConfig.KeychainIdentity)
+ protoConfig.Topic = topic
+ if not protoConfig.Topic:
+ postAlert("PushNotificationKeychainIdentityAlert", 0, [])
+ message = "Cannot extract APN topic"
+ return False, message
+
</ins><span class="cx"> else:
</span><span class="cx"> message = (
</span><span class="cx"> "No {proto} APNS Keychain Identity was set".format(
</span><span class="lines">@@ -1413,6 +1411,7 @@
</span><span class="cx"> return False, message
</span><span class="cx">
</span><span class="cx"> else:
</span><ins>+ # Verify the cert exists
</ins><span class="cx"> if not os.path.exists(protoConfig.CertificatePath):
</span><span class="cx"> message = (
</span><span class="cx"> "The {proto} APNS certificate ({cert}) is missing".format(
</span><span class="lines">@@ -1466,7 +1465,7 @@
</span><span class="cx"> message = (
</span><span class="cx"> "The {proto} APNS Keychain Identity ({cert}) cannot be used: {reason}".format(
</span><span class="cx"> proto=protocol,
</span><del>- cert=certificate_title,
</del><ins>+ cert=protoConfig.KeychainIdentity,
</ins><span class="cx"> reason=str(e)
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>