Merge pull request #560 from ziggie1984/bugfix-nil-pointer

loopd: nil-pointer bug when showing subsystems

Author: hieblmi

loopd/log.go

@@ -21,7 +21,6 @@ import (
 const Subsystem = "LOOPD"
 
 var (
-	logWriter   *build.RotatingLogWriter
 	log         btclog.Logger
 	interceptor signal.Interceptor
 )
@@ -30,7 +29,6 @@ var (
 func SetupLoggers(root *build.RotatingLogWriter, intercept signal.Interceptor) {
 	genLogger := genSubLogger(root, intercept)
 
-	logWriter = root
 	log = build.NewSubLogger(Subsystem, genLogger)
 	interceptor = intercept
 

loopd/run.go

@@ -180,13 +180,6 @@ func Run(rpcCfg RPCConfig) error {
 		os.Exit(0)
 	}
 
-	// Special show command to list supported subsystems and exit.
-	if config.DebugLevel == "show" {
-		fmt.Printf("Supported subsystems: %v\n",
-			logWriter.SupportedSubsystems())
-		os.Exit(0)
-	}
-
 	// Validate our config before we proceed.
 	if err := Validate(&config); err != nil {
 		return err
@@ -205,6 +198,14 @@ func Run(rpcCfg RPCConfig) error {
 	logWriter := build.NewRotatingLogWriter()
 	SetupLoggers(logWriter, shutdownInterceptor)
 
+	// Special show command to list supported subsystems and exit.
+	if config.DebugLevel == "show" {
+		fmt.Printf("Supported subsystems: %v\n",
+			logWriter.SupportedSubsystems())
+
+		os.Exit(0)
+	}
+
 	err = logWriter.InitLogRotator(
 		filepath.Join(config.LogDir, defaultLogFilename),
 		config.MaxLogFileSize, config.MaxLogFiles,