1 files changed, 15 insertions, 11 deletions

diff --git a/server/main.cpp b/server/main.cpp
index 50570fd3..27596f7d 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -83,19 +83,8 @@ int main() {
         exit(1);
     };
 
-    std::unique_ptr<NFLogListener> logListener;
-    {
-        auto result = makeNFLogListener();
-        if (!isOk(result)) {
-            ALOGE("Unable to create NFLogListener: %s", result.status().msg().c_str());
-            exit(1);
-        }
-        logListener = std::move(result.value());
-    }
-
     gCtls = new android::net::Controllers();
     gCtls->init();
-    gCtls->wakeupCtrl.init(logListener.get());
 
     CommandListener cl;
     nm->setBroadcaster((SocketListener *) &cl);
@@ -105,6 +94,21 @@ int main() {
         exit(1);
     }
 
+    std::unique_ptr<NFLogListener> logListener;
+    {
+        auto result = makeNFLogListener();
+        if (!isOk(result)) {
+            ALOGE("Unable to create NFLogListener: %s", toString(result).c_str());
+            exit(1);
+        }
+        logListener = std::move(result.value());
+        auto status = gCtls->wakeupCtrl.init(logListener.get());
+        if (!isOk(result)) {
+            ALOGE("Unable to init WakeupController: %s", toString(result).c_str());
+            // We can still continue without wakeup packet logging.
+        }
+    }
+
     // Set local DNS mode, to prevent bionic from proxying
     // back to this service, recursively.
     setenv("ANDROID_DNS_MODE", "local", 1);