Merge pull request #1997 from Expensify/main

Expensify · Dec 3, 2024 · b635b1a · b635b1a
2 parents e7516de + b6f3e8e
commit b635b1a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 42 deletions.
diff --git a/libstuff/SLog.cpp b/libstuff/SLog.cpp
@@ -41,57 +41,17 @@ void SLogStackTrace(int level) {
 }
 
 // If the param name is not in this whitelist, we will log <REDACTED> in addLogParams.
-static const set<string> PARAMS_WHITELIST = {
-    "accountID",
-    "authEmail",
-    "accountIDs",
-    "attendees",
-    "bankAccountID",
-    "cardData",
-    "cardID",
-    "clientUpdateID",
+static set<string> PARAMS_WHITELIST = {
     "command",
-    "companyName",
-    "companyWebsite",
     "Connection",
     "Content-Length",
     "count",
-    "currentTime",
-    "domainAccountID",
-    "domainName",
-    "email",
-    "errorMessage",
-    "feed",
-    "feedCountry",
-    "feedID",
-    "feedName",
-    "field",
-    "index",
     "indexName",
-    "invoice",
     "isUnique",
-    "key",
-    "lastIP",
     "logParam",
-    "nvpName",
-    "policyAccountID",
-    "policyID",
-    "reimbursementEntryID",
-    "reportID",
     "requestID",
-    "requestTimestamp",
-    "secondaryLogin",
-    "shouldCompleteOnboarding",
-    "shouldDismissHybridAppOnboarding",
     "status",
-    "step",
-    "timeDiff",
-    "token",
-    "transactionID",
-    "type",
     "userID",
-    "secondaryLogin",
-    "walletBankAccountID"
 };
 
 string addLogParams(string&& message, const STable& params) {
@@ -114,3 +74,7 @@ string addLogParams(string&& message, const STable& params) {
 
     return message;
 }
+
+void SWhitelistLogParams(set<string> params) {
+    PARAMS_WHITELIST.insert(params.begin(), params.end());
+}
diff --git a/libstuff/libstuff.h b/libstuff/libstuff.h
@@ -233,6 +233,9 @@ void SLogLevel(int level);
 // Stack trace logging
 void SLogStackTrace(int level = LOG_WARNING);
 
+// This method will allow plugins to whitelist log params they need to log.
+void SWhitelistLogParams(set<string> params);
+
 // This is a drop-in replacement for syslog that directly logs to `/run/systemd/journal/syslog` bypassing journald.
 void SSyslogSocketDirect(int priority, const char* format, ...);
 

diff --git a/sqlitecluster/SQLite.cpp b/sqlitecluster/SQLite.cpp
@@ -806,7 +806,7 @@ int SQLite::commit(const string& description, function<void()>* preCheckpointCal
             }
             _sharedData.checkpointInProgress.clear();
         }
-        SINFO(description << " COMMIT complete in " << time << ". Wrote " << (endPages - startPages)
+        SINFO(description << " COMMIT " << SToStr(_sharedData.commitCount) << " complete in " << time << ". Wrote " << (endPages - startPages)
               << " pages. WAL file size is " << sz << " bytes. " << _queryCount << " queries attempted, " << _cacheHits
               << " served from cache. Used journal " << _journalName);
         _queryCount = 0;

diff --git a/test/clustertest/tests/ForkedNodeApprovalTest.cpp b/test/clustertest/tests/ForkedNodeApprovalTest.cpp
@@ -152,5 +152,10 @@ struct ForkedNodeApprovalTest : tpunit::TestFixture {
         // Ok, now we can start the second follower back up and secondary leader should be able to lead.
         tester.getTester(2).startServer(false);
         ASSERT_TRUE(tester.getTester(1).waitForState("LEADING"));
+
+        // We call stopServer on the forked leader because it crashed, but the cluster tester doesn't realize, so shutting down
+        // normally will time out after a minute. Calling `stopServer` explicitly will clear the server PID, and we won't need
+        // to wait for this timeout.
+        tester.getTester(0).stopServer();
     }
 } __ForkedNodeApprovalTest;