Skip to content
Snippets Groups Projects
Commit 27b8ee93 authored by ale's avatar ale
Browse files

actually pass the config file to liquidsoap

parent c50d8b2d
Branches
No related tags found
No related merge requests found
...@@ -91,8 +91,6 @@ func (p *liquidsoapParams) Render(w io.Writer) error { ...@@ -91,8 +91,6 @@ func (p *liquidsoapParams) Render(w io.Writer) error {
// Stop(). // Stop().
type liquidsoapController struct { type liquidsoapController struct {
params *liquidsoapParams params *liquidsoapParams
tmpdir string
configPath string
restartDelay time.Duration restartDelay time.Duration
// Information about the running process. The lock protects // Information about the running process. The lock protects
...@@ -139,7 +137,7 @@ func (l *liquidsoapController) runOnce() { ...@@ -139,7 +137,7 @@ func (l *liquidsoapController) runOnce() {
// channel is closed (requesting termination). Keep the lock // channel is closed (requesting termination). Keep the lock
// held until l.process is set, so that we can synchronize the // held until l.process is set, so that we can synchronize the
// process termination properly. // 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.Stdout = os.Stderr
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
...@@ -196,6 +194,4 @@ func (l *liquidsoapController) Stop() { ...@@ -196,6 +194,4 @@ func (l *liquidsoapController) Stop() {
l.lock.Unlock() l.lock.Unlock()
l.wg.Wait() l.wg.Wait()
os.RemoveAll(l.tmpdir)
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment