neale
/
spongy
mirror of https://github.com/nealey/spongy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass along inherited environemnt variables

This commit is contained in:
Neale Pickett 2016-05-18 23:02:23 +00:00
parent cfe75df50f
commit e9ccb68622
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spongyd/network.go
View File

@ -191,14 +191,13 @@ func (nw *Network) messageDispatchLoop() {
handlerPath := path.Join(nw.basePath, "handler")
cmd := exec.Command(handlerPath, m.Args...)
cmd.Env = []string{
"command=" + m.Command,
"fullsender=" + m.FullSender,
"sender=" + m.Sender,
"forum=" + m.Forum,
"text=" + m.Text,
"raw=" + line,
}
cmd.Env = os.Environ()
cmd.Env = append(cmd.Env, "command=" + m.Command)
cmd.Env = append(cmd.Env, "fullsender=" + m.FullSender)
cmd.Env = append(cmd.Env, "sender=" + m.Sender)
cmd.Env = append(cmd.Env, "forum=" + m.Forum)
cmd.Env = append(cmd.Env, "text=" + m.Text)
cmd.Env = append(cmd.Env, "raw=" + line)
cmd.Stderr = os.Stderr
out, err := cmd.Output()
if err != nil {

1
spongyd/spongyd.go
View File

@ -104,4 +104,5 @@ func main() {
runsvdir(basePath)
running = false
log.Print("Exiting for some reason!")
}