Revert back the code changes in #436 and #443 (#445)

* Revert back the code changes in #436 and #443

* Docker restart always

Author: bnshr

Makefile

@@ -98,7 +98,7 @@ run-collector: clone-tnf-secrets stop-running-collector-container
 
 # Runs collector on rds with docker
 run-collector-rds: clone-tnf-secrets stop-running-collector-container
-	docker run -d --pull always -p ${HOST_PORT}:${TARGET_PORT} --name ${COLLECTOR_CONTAINER_NAME} \
+	docker run --restart always -d --pull always -p ${HOST_PORT}:${TARGET_PORT} --name ${COLLECTOR_CONTAINER_NAME} \
 		-e DB_USER='$(shell jq -r ".MysqlUsername" "./tnf-secrets/collector-secrets.json" | base64 -d)' \
 		-e DB_PASSWORD='$(shell jq -r ".MysqlPassword" "./tnf-secrets/collector-secrets.json" | base64 -d)' \
 		-e DB_URL='${DB_URL}' \

api/server.go

@@ -27,11 +27,10 @@ func NewServer(listenAddr string, db *storage.MySQLStorage, objectStore *storage
 	}
 }
 
-func (s *Server) Start() {
+func (s *Server) Start() error {
 	logrus.Info("Starting server")
 	http.HandleFunc("/", s.handler)
-	//nolint:errcheck
-	s.server.ListenAndServe()
+	return s.server.ListenAndServe()
 }
 
 func (s *Server) handler(w http.ResponseWriter, r *http.Request) {

main.go

@@ -23,5 +23,5 @@ func main() {
 	server := api.NewServer(addr, mysqlStore, s3Store,
 		time.Duration(readTimeOut)*time.Second, time.Duration(writeTimeOut)*time.Second)
 
-	server.Start()
+	logrus.Fatal(server.Start())
 }