From 19cffc29c995af8fb155f2764664f0b079879b4f Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Tue, 12 May 2020 12:09:12 -0600
Subject: [PATCH] remove unused extra json fields

---
 src/libstore/local-store.cc  |  1 -
 src/libstore/remote-store.cc |  9 ---------
 src/libutil/logging.cc       | 24 ------------------------
 3 files changed, 34 deletions(-)

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 1f16a22b1..63a825af0 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1364,7 +1364,6 @@ void LocalStore::verifyPath(const Path & pathS, const StringSet & store,
             auto state(_state.lock());
             invalidatePath(*state, path);
         } else {
-            // TODO log as warning if repair successful??
             logError(
                 ErrorInfo { 
                     .name = "Missing path with referrers",
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 7c50c1065..cc336e460 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -780,15 +780,6 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source *
         }
 
         else if (msg == STDERR_NEXT)
-            // TODO: is this really an ErrorInfo error?  Seems like we're forwarding the 
-            // stderr output of the remote to current stderr/log 
-            // ErrorInfo gets lost in this scenario.
-            // An alternative might be a logger on the remote that forwards ErrorInfo and etc.
-            // logError(
-            //     ErrorInfo { 
-            //         // .name = "Remote Store" TODO reasonable name.
-            //         .hint = hintfmt(chomp(readString(from)))
-            // });
             printError(chomp(readString(from)));
 
         else if (msg == STDERR_START_ACTIVITY) {
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 7c75456ee..736ce604e 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -150,7 +150,6 @@ struct JSONLogger : Logger {
 
     void logEI(const ErrorInfo & ei) override
     {
-        // add fields like Pos info and etc?
         std::ostringstream oss;
         oss << ei;
 
@@ -159,29 +158,6 @@ struct JSONLogger : Logger {
         json["level"] = ei.level;
         json["msg"] = oss.str();
 
-        // Extra things that COULD go into json.  Useful?
-        // TODO: decide if useful.
-        // TODO: make a json obj that goes into json["msg"]?
-        json["name"] = ei.name;
-        json["description"] = ei.description;
-        if (ei.hint.has_value()) {
-            json["hint"] = ei.hint->str();
-        }
-        if (ei.nixCode.has_value()) {
-            if (ei.nixCode->errPos.line != 0)
-                json["line"] = ei.nixCode->errPos.line;
-            if (ei.nixCode->errPos.column != 0)
-                json["column"] = ei.nixCode->errPos.column;
-            if (ei.nixCode->errPos.file != "")
-                json["file"] = ei.nixCode->errPos.file;
-            if (ei.nixCode->prevLineOfCode.has_value())
-                json["prevLineOfCode"] = *ei.nixCode->prevLineOfCode;
-            if (ei.nixCode->errLineOfCode.has_value())
-                json["errLineOfCode"] = *ei.nixCode->errLineOfCode;
-            if (ei.nixCode->nextLineOfCode.has_value())
-                json["nextLineOfCode"] = *ei.nixCode->nextLineOfCode;
-        }
-
         write(json);
     }