Don't require env var PROJECT_NAME (#34)

* Don't require env var PROJECT_NAME

* log

Author: emosbaugh

log/init.go

@@ -1,17 +1,15 @@
 package log
 
 import (
-	golog "log"
-
 	"github.com/replicatedcom/saaskit/param"
 )
 
 func Init(logOpts *LogOptions, mailLogOpts *MailLogOptions, slackLogOpts *SlackLogOptions) {
-	projectName := param.Lookup("PROJECT_NAME", "", false)
-	if projectName == "" {
-		golog.Fatalf("PROJECT_NAME must be set prior to configuring the saaskit logger")
-	}
 	InitLog(logOpts)
 	InitMail(mailLogOpts)
 	InitSlack(slackLogOpts)
+
+	if param.Lookup("PROJECT_NAME", "", false) == "" {
+		Infof("Environment variable PROJECT_NAME not set")
+	}
 }

log/log.go

@@ -55,12 +55,15 @@ func InitLog(opts *LogOptions) {
 	}
 
 	if opts.BugsnagKey != "" {
-		bugsnag.Configure(bugsnag.Configuration{
+		config := bugsnag.Configuration{
 			ReleaseStage:        param.Lookup("ENVIRONMENT", "/replicated/environment", false),
 			APIKey:              opts.BugsnagKey,
 			NotifyReleaseStages: []string{"production", "staging"},
-			ProjectPackages:     []string{fmt.Sprintf("%s*", param.Lookup("PROJECT_NAME", "", false))},
-		})
+		}
+		if projectName := param.Lookup("PROJECT_NAME", "", false); projectName != "" {
+			config.ProjectPackages = append(config.ProjectPackages, fmt.Sprintf("%s*", projectName))
+		}
+		bugsnag.Configure(config)
 
 		hook, err := NewBugsnagHook()
 		if err != nil {
@@ -129,7 +132,7 @@ func Errorf(format string, args ...interface{}) {
 
 func shortPath(pathIn string) string {
 	projectName := param.Lookup("PROJECT_NAME", "", false)
-	if !strings.Contains(pathIn, projectName) {
+	if projectName == "" || !strings.Contains(pathIn, projectName) {
 		return pathIn
 	}
 

log/mail.go

@@ -25,12 +25,13 @@ func InitMail(opts *MailLogOptions) {
 	}
 
 	MailLog.OnBeforeLog(func(entry *logrus.Entry) *logrus.Entry {
-		return entry.WithFields(
-			logrus.Fields{
-				"project.name": param.Lookup("PROJECT_NAME", "", false),
-				"environment":  param.Lookup("ENVIRONMENT", "/replicated/environment", false),
-			},
-		)
+		fields := logrus.Fields{
+			"environment": param.Lookup("ENVIRONMENT", "/replicated/environment", false),
+		}
+		if projectName := param.Lookup("PROJECT_NAME", "", false); projectName != "" {
+			fields["project.name"] = projectName
+		}
+		return entry.WithFields(fields)
 	})
 
 	if opts.Recipients != "" {

log/mailapi_hook.go

@@ -29,17 +29,15 @@ func (hook *MailAPIHook) Fire(entry *logrus.Entry) error {
 	}
 
 	context := map[string]interface{}{
-		"project_name": hook.ProjectName,
-		"time":         entry.Time.Format(mailLoggerTimeFormat),
-		"message":      entry.Message,
-		"fields":       entry.Data,
+		"time":    entry.Time.Format(mailLoggerTimeFormat),
+		"message": entry.Message,
+		"fields":  entry.Data,
 	}
-
-	if err := mail.SendMailInternal("", "", recipients, "internal-log-message", subject, context); err != nil {
-		return err
+	if hook.ProjectName != "" {
+		context["project_name"] = hook.ProjectName
 	}
 
-	return nil
+	return mail.SendMailInternal("", "", recipients, "internal-log-message", subject, context)
 }
 
 func (sh *MailAPIHook) Levels() []logrus.Level {

log/slack.go

@@ -25,12 +25,13 @@ func InitSlack(opts *SlackLogOptions) {
 	}
 
 	SlackLog.OnBeforeLog(func(entry *logrus.Entry) *logrus.Entry {
-		return entry.WithFields(
-			logrus.Fields{
-				"project.name": param.Lookup("PROJECT_NAME", "", false),
-				"environment":  param.Lookup("ENVIRONMENT", "/replicated/environment", false),
-			},
-		)
+		fields := logrus.Fields{
+			"environment": param.Lookup("ENVIRONMENT", "/replicated/environment", false),
+		}
+		if projectName := param.Lookup("PROJECT_NAME", "", false); projectName != "" {
+			fields["project.name"] = projectName
+		}
+		return entry.WithFields(fields)
 	})
 
 	slackLogHookURL := param.Lookup("SLACKLOG_HOOK_URL", "/slack/hook_url", true)

param/param.go

@@ -69,13 +69,15 @@ func (c *ParamCache) ssmGet(ssmName string, decrypt bool) (string, bool) {
 		log.Printf("Failed to get ssm param %s: %v", ssmName, err)
 		return "", false
 	}
-	if len(resp.InvalidParameters) > 0 {
+	if os.Getenv("DEBUG") != "" && len(resp.InvalidParameters) > 0 {
 		for _, p := range resp.InvalidParameters {
 			log.Printf("Ssm param %s invalid", *p)
 		}
-		return "", false
 	}
 
+	if len(resp.Parameters) == 0 {
+		return "", false
+	}
 	val := *(resp.Parameters[0].Value)
 	c.mapSet(ssmName, val)
 	return val, true