Skip to content

Commit fa1bc7c

Browse files
author
MarcoFalke
committed
scripted-diff: Log parameter interaction not thrice
-BEGIN VERIFY SCRIPT- sed -i 's/LogPrintf("%s: \(parameter interaction: .*\)", __func__/LogInfo("\1"/g' ./src/init.cpp -END VERIFY SCRIPT-
1 parent fafb787 commit fa1bc7c

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

src/init.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -732,73 +732,73 @@ void InitParameterInteraction(ArgsManager& args)
732732
// even when -connect or -proxy is specified
733733
if (args.IsArgSet("-bind")) {
734734
if (args.SoftSetBoolArg("-listen", true))
735-
LogPrintf("%s: parameter interaction: -bind set -> setting -listen=1\n", __func__);
735+
LogInfo("parameter interaction: -bind set -> setting -listen=1\n");
736736
}
737737
if (args.IsArgSet("-whitebind")) {
738738
if (args.SoftSetBoolArg("-listen", true))
739-
LogPrintf("%s: parameter interaction: -whitebind set -> setting -listen=1\n", __func__);
739+
LogInfo("parameter interaction: -whitebind set -> setting -listen=1\n");
740740
}
741741

742742
if (args.IsArgSet("-connect") || args.GetIntArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS) <= 0) {
743743
// when only connecting to trusted nodes, do not seed via DNS, or listen by default
744744
if (args.SoftSetBoolArg("-dnsseed", false))
745-
LogPrintf("%s: parameter interaction: -connect or -maxconnections=0 set -> setting -dnsseed=0\n", __func__);
745+
LogInfo("parameter interaction: -connect or -maxconnections=0 set -> setting -dnsseed=0\n");
746746
if (args.SoftSetBoolArg("-listen", false))
747-
LogPrintf("%s: parameter interaction: -connect or -maxconnections=0 set -> setting -listen=0\n", __func__);
747+
LogInfo("parameter interaction: -connect or -maxconnections=0 set -> setting -listen=0\n");
748748
}
749749

750750
std::string proxy_arg = args.GetArg("-proxy", "");
751751
if (proxy_arg != "" && proxy_arg != "0") {
752752
// to protect privacy, do not listen by default if a default proxy server is specified
753753
if (args.SoftSetBoolArg("-listen", false))
754-
LogPrintf("%s: parameter interaction: -proxy set -> setting -listen=0\n", __func__);
754+
LogInfo("parameter interaction: -proxy set -> setting -listen=0\n");
755755
// to protect privacy, do not map ports when a proxy is set. The user may still specify -listen=1
756756
// to listen locally, so don't rely on this happening through -listen below.
757757
if (args.SoftSetBoolArg("-upnp", false))
758-
LogPrintf("%s: parameter interaction: -proxy set -> setting -upnp=0\n", __func__);
758+
LogInfo("parameter interaction: -proxy set -> setting -upnp=0\n");
759759
if (args.SoftSetBoolArg("-natpmp", false)) {
760-
LogPrintf("%s: parameter interaction: -proxy set -> setting -natpmp=0\n", __func__);
760+
LogInfo("parameter interaction: -proxy set -> setting -natpmp=0\n");
761761
}
762762
// to protect privacy, do not discover addresses by default
763763
if (args.SoftSetBoolArg("-discover", false))
764-
LogPrintf("%s: parameter interaction: -proxy set -> setting -discover=0\n", __func__);
764+
LogInfo("parameter interaction: -proxy set -> setting -discover=0\n");
765765
}
766766

767767
if (!args.GetBoolArg("-listen", DEFAULT_LISTEN)) {
768768
// do not map ports or try to retrieve public IP when not listening (pointless)
769769
if (args.SoftSetBoolArg("-upnp", false))
770-
LogPrintf("%s: parameter interaction: -listen=0 -> setting -upnp=0\n", __func__);
770+
LogInfo("parameter interaction: -listen=0 -> setting -upnp=0\n");
771771
if (args.SoftSetBoolArg("-natpmp", false)) {
772-
LogPrintf("%s: parameter interaction: -listen=0 -> setting -natpmp=0\n", __func__);
772+
LogInfo("parameter interaction: -listen=0 -> setting -natpmp=0\n");
773773
}
774774
if (args.SoftSetBoolArg("-discover", false))
775-
LogPrintf("%s: parameter interaction: -listen=0 -> setting -discover=0\n", __func__);
775+
LogInfo("parameter interaction: -listen=0 -> setting -discover=0\n");
776776
if (args.SoftSetBoolArg("-listenonion", false))
777-
LogPrintf("%s: parameter interaction: -listen=0 -> setting -listenonion=0\n", __func__);
777+
LogInfo("parameter interaction: -listen=0 -> setting -listenonion=0\n");
778778
if (args.SoftSetBoolArg("-i2pacceptincoming", false)) {
779-
LogPrintf("%s: parameter interaction: -listen=0 -> setting -i2pacceptincoming=0\n", __func__);
779+
LogInfo("parameter interaction: -listen=0 -> setting -i2pacceptincoming=0\n");
780780
}
781781
}
782782

783783
if (args.IsArgSet("-externalip")) {
784784
// if an explicit public IP is specified, do not try to find others
785785
if (args.SoftSetBoolArg("-discover", false))
786-
LogPrintf("%s: parameter interaction: -externalip set -> setting -discover=0\n", __func__);
786+
LogInfo("parameter interaction: -externalip set -> setting -discover=0\n");
787787
}
788788

789789
if (args.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
790790
// disable whitelistrelay in blocksonly mode
791791
if (args.SoftSetBoolArg("-whitelistrelay", false))
792-
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistrelay=0\n", __func__);
792+
LogInfo("parameter interaction: -blocksonly=1 -> setting -whitelistrelay=0\n");
793793
// Reduce default mempool size in blocksonly mode to avoid unexpected resource usage
794794
if (args.SoftSetArg("-maxmempool", ToString(DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB)))
795-
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -maxmempool=%d\n", __func__, DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB);
795+
LogInfo("parameter interaction: -blocksonly=1 -> setting -maxmempool=%d\n", DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB);
796796
}
797797

798798
// Forcing relay from whitelisted hosts implies we will accept relays from them in the first place.
799799
if (args.GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
800800
if (args.SoftSetBoolArg("-whitelistrelay", true))
801-
LogPrintf("%s: parameter interaction: -whitelistforcerelay=1 -> setting -whitelistrelay=1\n", __func__);
801+
LogInfo("parameter interaction: -whitelistforcerelay=1 -> setting -whitelistrelay=1\n");
802802
}
803803
if (args.IsArgSet("-onlynet")) {
804804
const auto onlynets = args.GetArgs("-onlynet");
@@ -807,7 +807,7 @@ void InitParameterInteraction(ArgsManager& args)
807807
return n == NET_IPV4 || n == NET_IPV6;
808808
});
809809
if (!clearnet_reachable && args.SoftSetBoolArg("-dnsseed", false)) {
810-
LogPrintf("%s: parameter interaction: -onlynet excludes IPv4 and IPv6 -> setting -dnsseed=0\n", __func__);
810+
LogInfo("parameter interaction: -onlynet excludes IPv4 and IPv6 -> setting -dnsseed=0\n");
811811
}
812812
}
813813
}

0 commit comments

Comments
 (0)