<!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>[225685] trunk/Source/WebCore</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.webkit.org/projects/webkit/changeset/225685">225685</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-12-08 11:01:04 -0800 (Fri, 08 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Improve error handling in RegistrationDatabase
https://bugs.webkit.org/show_bug.cgi?id=180587

Reviewed by Brady Eidson.

* workers/service/server/RegistrationDatabase.cpp:
(WebCore::RegistrationDatabase::openSQLiteDatabase):
(WebCore::RegistrationDatabase::doPushChanges):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreworkersserviceserverRegistrationDatabasecpp">trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (225684 => 225685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-12-08 18:37:08 UTC (rev 225684)
+++ trunk/Source/WebCore/ChangeLog      2017-12-08 19:01:04 UTC (rev 225685)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-12-08  Chris Dumez  <cdumez@apple.com>
+
+        Improve error handling in RegistrationDatabase
+        https://bugs.webkit.org/show_bug.cgi?id=180587
+
+        Reviewed by Brady Eidson.
+
+        * workers/service/server/RegistrationDatabase.cpp:
+        (WebCore::RegistrationDatabase::openSQLiteDatabase):
+        (WebCore::RegistrationDatabase::doPushChanges):
+
</ins><span class="cx"> 2017-12-07  Darin Adler  <darin@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Simplify and streamline some Color-related code to prepare for some Color/ExtendedColor work
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersserviceserverRegistrationDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp (225684 => 225685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp     2017-12-08 18:37:08 UTC (rev 225684)
+++ trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp        2017-12-08 19:01:04 UTC (rev 225685)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "RegistrationStore.h"
</span><span class="cx"> #include "SQLiteDatabase.h"
</span><ins>+#include "SQLiteFileSystem.h"
</ins><span class="cx"> #include "SQLiteStatement.h"
</span><span class="cx"> #include "SQLiteTransaction.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -89,10 +90,12 @@
</span><span class="cx">     String errorMessage;
</span><span class="cx">     auto scopeExit = makeScopeExit([&, errorMessage = &errorMessage] {
</span><span class="cx">         ASSERT_UNUSED(errorMessage, !errorMessage->isNull());
</span><del>-        LOG_ERROR("Failed to open Service Worker registration database: %s", errorMessage->utf8().data());
</del><ins>+        RELEASE_LOG_ERROR(ServiceWorker, "Failed to open Service Worker registration database: %s", errorMessage->utf8().data());
</ins><span class="cx">         m_database = nullptr;
</span><span class="cx">         postTaskReply(createCrossThreadTask(*this, &RegistrationDatabase::databaseFailedToOpen));
</span><span class="cx">     });
</span><ins>+
+    SQLiteFileSystem::ensureDatabaseDirectoryExists(m_databaseDirectory.isolatedCopy());
</ins><span class="cx">     
</span><span class="cx">     m_database = std::make_unique<SQLiteDatabase>();
</span><span class="cx">     if (!m_database->open(fullFilename)) {
</span><span class="lines">@@ -206,7 +209,8 @@
</span><span class="cx"> 
</span><span class="cx"> void RegistrationDatabase::doPushChanges(Vector<ServiceWorkerContextData>&& datas)
</span><span class="cx"> {
</span><del>-    ASSERT(m_database);
</del><ins>+    if (!m_database)
+        return;
</ins><span class="cx"> 
</span><span class="cx">     SQLiteTransaction transaction(*m_database);
</span><span class="cx">     transaction.begin();
</span><span class="lines">@@ -213,7 +217,7 @@
</span><span class="cx"> 
</span><span class="cx">     SQLiteStatement sql(*m_database, ASCIILiteral("INSERT INTO Records VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"));
</span><span class="cx">     if (sql.prepare() != SQLITE_OK) {
</span><del>-        LOG_ERROR("Failed to prepare statement to store registration data into records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
</del><ins>+        RELEASE_LOG_ERROR(ServiceWorker, "Failed to prepare statement to store registration data into records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -223,7 +227,7 @@
</span><span class="cx">             if (sql.prepare() != SQLITE_OK
</span><span class="cx">                 || sql.bindText(1, data.registration.key.toDatabaseKey()) != SQLITE_OK
</span><span class="cx">                 || sql.step() != SQLITE_DONE) {
</span><del>-                LOG_ERROR("Failed to remove registration data from records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
</del><ins>+                RELEASE_LOG_ERROR(ServiceWorker, "Failed to remove registration data from records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
</ins><span class="cx">                 return;
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="lines">@@ -240,7 +244,7 @@
</span><span class="cx">             || sql.bindText(8, data.script) != SQLITE_OK
</span><span class="cx">             || sql.bindText(9, workerTypeToString(data.workerType)) != SQLITE_OK
</span><span class="cx">             || sql.step() != SQLITE_DONE) {
</span><del>-            LOG_ERROR("Failed to store registration data into records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
</del><ins>+            RELEASE_LOG_ERROR(ServiceWorker, "Failed to store registration data into records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>