commit b31fd69b1683915e73006fcc5f45b15c7ed5b941
author Erik Kline <ek@google.com> Wed Jun 06 20:50:11 2018 +0900
committer Erik Kline <ek@google.com> Tue Jul 10 16:05:04 2018 +0900
tree 4bdbdf01596650d152ceef9c1f7a9b4ed745c859
parent 4e19cb8648df44b1642fbe13890e1f76fc938588

Add basic logging infrastructure for bugreports

Test: as follows
    - built, flashed, booted
    - "adb shell dumpsys netd" shows logs
    - tests/runtests.sh passes
Change-Id: I0e44da7f9a9cc53074ffc396b958e9e2dbcd2603

server/main.cpp

diff --git a/server/main.cpp b/server/main.cpp
index 7d89dd6..0f5716b 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -67,10 +67,10 @@
 android::RWLock android::net::gBigNetdLock;
 
 int main() {
+    using android::net::gLog;
     using android::net::gCtls;
     Stopwatch s;
-
-    ALOGI("Netd 1.0 starting");
+    gLog.info("netd 1.0 starting");
 
     android::net::process::removePidFile(PID_FILE_PATH);
     android::net::process::blockSigPipe();
@@ -112,7 +112,7 @@
         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());
+            gLog.error("Unable to init WakeupController: %s", toString(result).c_str());
             // We can still continue without wakeup packet logging.
         }
     }
@@ -144,7 +144,7 @@
         ALOGE("Unable to start NetdNativeService: %d", ret);
         exit(1);
     }
-    ALOGI("Registering NetdNativeService: %.1fms", subTime.getTimeAndReset());
+    gLog.info("Registering NetdNativeService: %.1fms", subTime.getTimeAndReset());
 
     /*
      * Now that we're up, we can respond to commands. Starting the listener also tells
@@ -154,7 +154,7 @@
         ALOGE("Unable to start CommandListener (%s)", strerror(errno));
         exit(1);
     }
-    ALOGI("Starting CommandListener: %.1fms", subTime.getTimeAndReset());
+    gLog.info("Starting CommandListener: %.1fms", subTime.getTimeAndReset());
 
     android::net::process::ScopedPidFile pidFile(PID_FILE_PATH);
 
@@ -165,13 +165,13 @@
         ALOGE("Unable to start NetdHwService: %d", ret);
         exit(1);
     }
-    ALOGI("Registering NetdHwService: %.1fms", subTime.getTimeAndReset());
+    gLog.info("Registering NetdHwService: %.1fms", subTime.getTimeAndReset());
 
-    ALOGI("Netd started in %dms", static_cast<int>(s.timeTaken()));
+    gLog.info("Netd started in %dms", static_cast<int>(s.timeTaken()));
 
     IPCThreadState::self()->joinThreadPool();
 
-    ALOGI("Netd exiting");
+    gLog.info("netd exiting");
 
     exit(0);
 }