From e083663a77add7f40cb2d3e58441b80e8b22a061 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Wed, 17 Jun 2020 23:01:49 -0700
Subject: [PATCH] Continue to standardize on logging

---
 client.go      |  5 +++--
 config.go      | 29 +++++++++++++----------------
 ipfsStorage.go |  4 ++--
 s3Storage.go   |  4 ++--
 stats.go       |  2 +-
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/client.go b/client.go
index 89f20c881..5f3bd4700 100644
--- a/client.go
+++ b/client.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 
+	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/websocket"
 )
 
@@ -24,11 +25,11 @@ type Client struct {
 func NewClient(ws *websocket.Conn, server *Server) *Client {
 
 	if ws == nil {
-		panic("ws cannot be nil")
+		log.Panicln("ws cannot be nil")
 	}
 
 	if server == nil {
-		panic("server cannot be nil")
+		log.Panicln("server cannot be nil")
 	}
 
 	ch := make(chan *ChatMessage, channelBufSize)
diff --git a/config.go b/config.go
index 5d2a63b10..d77701772 100644
--- a/config.go
+++ b/config.go
@@ -3,9 +3,6 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
-	"os"
-	"path"
-	"strconv"
 
 	log "github.com/sirupsen/logrus"
 
@@ -69,7 +66,7 @@ func getConfig() Config {
 	var config Config
 	err = yaml.Unmarshal(yamlFile, &config)
 	if err != nil {
-		panic(err)
+		log.Panicln(err)
 	}
 
 	// fmt.Printf("%+v\n", config)
@@ -79,37 +76,37 @@ func getConfig() Config {
 
 func checkConfig(config Config) {
 	if config.S3.Enabled && config.IPFS.Enabled {
-		panic("S3 and IPFS support cannot be enabled at the same time.  Choose one.")
+		log.Panicln("S3 and IPFS support cannot be enabled at the same time.  Choose one.")
 	}
 
 	if config.S3.Enabled {
 		if config.S3.AccessKey == "" || config.S3.Secret == "" {
-			panic("S3 support requires an access key and secret.")
+			log.Panicln("S3 support requires an access key and secret.")
 		}
 
 		if config.S3.Region == "" || config.S3.Endpoint == "" {
-			panic("S3 support requires a region and endpoint.")
+			log.Panicln("S3 support requires a region and endpoint.")
 		}
 
 		if config.S3.Bucket == "" {
-			panic("S3 support requires a bucket created for storing public video segments.")
+			log.Panicln("S3 support requires a bucket created for storing public video segments.")
 		}
 	}
 
-	if !fileExists(config.PrivateHLSPath) {
-		os.MkdirAll(path.Join(config.PrivateHLSPath, strconv.Itoa(0)), 0777)
-	}
+	// if !fileExists(config.PrivateHLSPath) {
+	// 	os.MkdirAll(path.Join(config.PrivateHLSPath, strconv.Itoa(0)), 0777)
+	// }
 
-	if !fileExists(config.PublicHLSPath) {
-		os.MkdirAll(path.Join(config.PublicHLSPath, strconv.Itoa(0)), 0777)
-	}
+	// if !fileExists(config.PublicHLSPath) {
+	// 	os.MkdirAll(path.Join(config.PublicHLSPath, strconv.Itoa(0)), 0777)
+	// }
 
 	if !fileExists(config.FFMpegPath) {
-		panic(fmt.Sprintf("ffmpeg does not exist at %s.", config.FFMpegPath))
+		log.Panicln(fmt.Sprintf("ffmpeg does not exist at %s.", config.FFMpegPath))
 	}
 
 	if config.VideoSettings.EncoderPreset == "" {
-		panic("A video encoder preset is required to be set in the config file.")
+		log.Panicln("A video encoder preset is required to be set in the config file.")
 	}
 
 }
diff --git a/ipfsStorage.go b/ipfsStorage.go
index a59bbe810..fe4aa55f4 100644
--- a/ipfsStorage.go
+++ b/ipfsStorage.go
@@ -57,7 +57,7 @@ func (s *IPFSStorage) Save(filePath string, retryCount int) string {
 	defer someFile.Close()
 
 	if err != nil {
-		panic(fmt.Errorf("Could not get File: %s", err))
+		log.Panicln(fmt.Errorf("Could not get File: %s", err))
 	}
 
 	opts := []options.UnixfsAddOption{
@@ -70,7 +70,7 @@ func (s *IPFSStorage) Save(filePath string, retryCount int) string {
 	cidFile, err := (*s.ipfs).Unixfs().Add(s.ctx, someFile, opts...)
 
 	if err != nil {
-		panic(fmt.Errorf("Could not add File: %s", err))
+		log.Panicln(fmt.Errorf("Could not add File: %s", err))
 	}
 
 	// fmt.Printf("Added file to IPFS with CID %s\n", cidFile.String())
diff --git a/s3Storage.go b/s3Storage.go
index 72cef7224..b3f9b16ed 100644
--- a/s3Storage.go
+++ b/s3Storage.go
@@ -92,7 +92,7 @@ func (s S3Storage) connectAWS() *session.Session {
 	creds := credentials.NewStaticCredentials(s.s3AccessKey, s.s3Secret, "")
 	_, err := creds.Get()
 	if err != nil {
-		panic(err)
+		log.Panicln(err)
 	}
 
 	sess, err := session.NewSession(
@@ -105,7 +105,7 @@ func (s S3Storage) connectAWS() *session.Session {
 	)
 
 	if err != nil {
-		panic(err)
+		log.Panicln(err)
 	}
 	return sess
 }
diff --git a/stats.go b/stats.go
index bc8fb9d21..4d12a70d1 100644
--- a/stats.go
+++ b/stats.go
@@ -145,7 +145,7 @@ func getSavedStats() *Stats {
 	var stats Stats
 	err = json.Unmarshal(jsonFile, &stats)
 	if err != nil {
-		panic(err)
+		log.Panicln(err)
 	}
 
 	return &stats