Commit 58b43686 authored by Lee Brown's avatar Lee Brown

fix panic from datadog disabled

parent f0b2b291
......@@ -96,7 +96,7 @@ func NewConfig(log *log.Logger, targetEnv Env, awsCredentials devdeploy.AwsCrede
// it will fail to create appropriate resources for the account of the forked user.
if cfg.ProjectName == "saas-starter-kit" {
remoteUser := gitRemoteUser(modDetails.ProjectRoot)
// Its a true fork from the origin repo.
if remoteUser != "oss" && remoteUser != "geeks-accelerator" {
// Replace the prefix 'saas' with the parent directory name, hopefully the gitlab group/username.
......
......@@ -238,6 +238,7 @@ func APP(shutdown chan os.Signal, appCtx *AppContext) http.Handler {
Redis: appCtx.Redis,
}
app.Handle("GET", "/v1/health", check.Health)
app.Handle("GET", "/ping", check.Ping)
// Handle static files/pages. Render a custom 404 page when file not found.
static := func(ctx context.Context, w http.ResponseWriter, r *http.Request, params map[string]string) error {
......
......@@ -27,7 +27,13 @@ func Errors(log *log.Logger, renderer web.Renderer) web.Middleware {
if er := before(ctx, w, r, params); er != nil {
// Log the error.
log.Printf("%d : ERROR : %+v", span.Context().TraceID(), er)
if span != nil && span.Context() != nil {
log.Printf("%d : ERROR : %+v", span.Context().TraceID(), er)
} else {
log.Printf("ERROR : %+v", er)
}
// Respond to the error.
if web.RequestIsJson(r) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment