fix startup

IntersectMBO · Nov 14, 2024 · ba32c24 · ba32c24
1 parent dd6495d
commit ba32c24
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/cardano-node/src/Cardano/Node/Configuration/POM.hs b/cardano-node/src/Cardano/Node/Configuration/POM.hs
@@ -268,7 +268,7 @@ instance FromJSON PartialNodeConfiguration where
       -- Logging parameters
       pncLoggingSwitch'  <-                 v .:? "TurnOnLogging" .!= True
       pncLogMetrics      <- Last        <$> v .:? "TurnOnLogMetrics"
-      useTraceDispatcher <-                 v .:? "UseTraceDispatcher" .!= False
+      useTraceDispatcher <-                 v .:? "UseTraceDispatcher" .!= True
       pncTraceConfig     <-  if pncLoggingSwitch'
                              then do
                                partialTraceSelection <- parseJSON $ Object v

diff --git a/configuration/cardano/mainnet-config-old-tracing.json b/configuration/cardano/mainnet-config-old-tracing.json
@@ -60,6 +60,7 @@
   "TracingVerbosity": "NormalVerbosity",
   "TurnOnLogMetrics": true,
   "TurnOnLogging": true,
+  "UseTraceDispatcher": false,
   "defaultBackends": [
     "KatipBK"
   ],

diff --git a/configuration/cardano/mainnet-config.json b/configuration/cardano/mainnet-config.json
@@ -3,10 +3,14 @@
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
   "ByronGenesisFile": "mainnet-byron-genesis.json",
   "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
+  "ConwayGenesisFile": "mainnet-conway-genesis.json",
+  "ConwayGenesisHash": "15a199f895e461ec0ffc6dd4e4028af28a492ab4e806d39cb674c88f7643ef62",
+  "EnableP2P": true,
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 0,
   "MaxKnownMajorProtocolVersion": 2,
+  "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresNoMagic",
   "ShelleyGenesisFile": "mainnet-shelley-genesis.json",
@@ -22,9 +26,9 @@
   "TraceOptions": {
     "": {
       "backends": [
-        "Stdout MachineFormat",
+        "Stdout HumanFormatColoured",
         "EKGBackend",
-        "Forwader"
+        "Forwarder"
       ],
       "severity": "Notice"
     },

diff --git a/configuration/cardano/mainnet-config.yaml b/configuration/cardano/mainnet-config.yaml
@@ -77,9 +77,9 @@ TraceOptionResourceFrequency: 1000
 TraceOptions:
   "":
     backends:
-      - "Stdout MachineFormat"
+      - "Stdout HumanFormatColoured"
       - "EKGBackend"
-      - "Forwader"
+      - "Forwarder"
     severity: "Notice"
   BlockFetch.Decision:
     severity: "Info"

diff --git a/nix/nixos/cardano-node-service.nix b/nix/nixos/cardano-node-service.nix
@@ -527,7 +527,7 @@ in {
 
       useLegacyTracing = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Use the legacy tracing, based on iohk-monitoring-framework.
         '';