From 27b8ee933d35001e6da463984fd8960e3e1116aa Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Fri, 24 Jul 2015 09:26:03 +0100
Subject: [PATCH] actually pass the config file to liquidsoap
---
node/liquidsoap.go | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/node/liquidsoap.go b/node/liquidsoap.go
index 3876ad17..752a1c9e 100644
--- a/node/liquidsoap.go
+++ b/node/liquidsoap.go
@@ -91,8 +91,6 @@ func (p *liquidsoapParams) Render(w io.Writer) error {
// Stop().
type liquidsoapController struct {
params *liquidsoapParams
- tmpdir string
- configPath string
restartDelay time.Duration
// Information about the running process. The lock protects
@@ -139,7 +137,7 @@ func (l *liquidsoapController) runOnce() {
// channel is closed (requesting termination). Keep the lock
// held until l.process is set, so that we can synchronize the
// process termination properly.
- cmd := exec.Command(*liquidsoapBin, "-T", "-U", "-v", l.configPath)
+ cmd := exec.Command(*liquidsoapBin, "-T", "-U", "-v", config)
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
if err := cmd.Start(); err != nil {
@@ -196,6 +194,4 @@ func (l *liquidsoapController) Stop() {
l.lock.Unlock()
l.wg.Wait()
-
- os.RemoveAll(l.tmpdir)
}
--
GitLab