From 75868a7005dd8aec99635ea3aa9c87b3a2264e04 Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zachwass2000@gmail.com>
Date: Tue, 23 Apr 2019 15:59:02 -0700
Subject: [PATCH] Do not panic after error reading config file (#2033)

Fixes #1445
---
 server/config/config.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/config/config.go b/server/config/config.go
index 0ff0820fd0..ae74a88efb 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"os"
 	"strings"
 	"time"
 
@@ -486,11 +487,12 @@ func (man Manager) loadConfigFile() {
 	man.viper.SetConfigFile(configFile)
 	err := man.viper.ReadInConfig()
 
-	fmt.Println("Using config file: ", man.viper.ConfigFileUsed())
-
 	if err != nil {
-		panic("Error reading config: " + err.Error())
+		fmt.Println("Error loading config file:", err)
+		os.Exit(1)
 	}
+
+	fmt.Println("Using config file: ", man.viper.ConfigFileUsed())
 }
 
 // TestConfig returns a barebones configuration suitable for use in tests.