Skip to content

Commit c6bcacf

Browse files
committed
nicer name
1 parent 0b22d51 commit c6bcacf

1 file changed

Lines changed: 4 additions & 9 deletions

File tree

caddy/caddy.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -625,22 +625,17 @@ func (f *FrankenPHPModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
625625
}
626626
}
627627

628-
if wc.Name == "" {
629-
name, _ := fastabs.FastAbs(wc.FileName)
630-
if name == "" {
631-
name = wc.FileName
632-
}
633-
wc.Name = name
634-
628+
if wc.Name == "" && len(wc.Env) > 0 {
635629
if len(wc.Env) > 0 {
636630
envString := ""
637631
for k, v := range wc.Env {
638632
envString += k + "=" + v + ","
639633
}
640-
wc.Name += "#" + envString
634+
envString = strings.TrimSuffix(envString, ",")
635+
wc.Name += "env:" + envString + "_"
641636
}
642637
}
643-
if !strings.HasPrefix(wc.Name, "m#") {
638+
if wc.Name != "" && !strings.HasPrefix(wc.Name, "m#") {
644639
wc.Name = "m#" + wc.Name
645640
}
646641

0 commit comments

Comments
 (0)