Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
autoradio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ale
autoradio
Commits
1b202d9d
Commit
1b202d9d
authored
Apr 13, 2019
by
ale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use pkill to reload Icecast by default
At least it doesn't require sudo like using systemctl.
parent
2974da92
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
21 deletions
+3
-21
node/icecast/controller.go
node/icecast/controller.go
+3
-21
No files found.
node/icecast/controller.go
View file @
1b202d9d
...
...
@@ -13,9 +13,9 @@ import (
"sync"
"time"
"git.autistici.org/ale/autoradio/util"
"git.autistici.org/ale/autoradio"
pb
"git.autistici.org/ale/autoradio/proto"
"git.autistici.org/ale/autoradio/util"
)
var
(
...
...
@@ -23,27 +23,9 @@ var (
// Timeout for all HTTP requests to the local Icecast.
icecastHTTPTimeout
=
5
*
time
.
Second
icecastReloadCmd
=
flag
.
String
(
"icecast-reload-command"
,
""
,
"Command to reload the icecast2 daemon"
)
)
const
(
systemdReloadCmd
=
"sudo systemctl reload icecast2.service || sudo systemctl restart icecast2.service"
debianReloadCmd
=
"/usr/sbin/service icecast2 reload || /usr/sbin/service icecast2 restart"
genericReloadCmd
=
"pkill -HUP icecast2"
icecastReloadCmd
=
flag
.
String
(
"icecast-reload-command"
,
"pkill -HUP icecast2"
,
"Command to reload the icecast2 daemon"
)
)
func
init
()
{
// Try to set a system-specific sane default for
// --icecast-reload-command.
if
_
,
err
:=
os
.
Stat
(
"/bin/systemctl"
);
err
==
nil
{
*
icecastReloadCmd
=
systemdReloadCmd
}
else
if
_
,
err
:=
os
.
Stat
(
"/usr/sbin/service"
);
err
==
nil
{
*
icecastReloadCmd
=
debianReloadCmd
}
else
{
*
icecastReloadCmd
=
genericReloadCmd
}
}
// IcecastController manages a local Icecast daemon.
//
// Managing the local Icecast instance is a less simple task than it
...
...
@@ -145,7 +127,7 @@ func (c *Controller) killSources(ctx context.Context, mounts []*pb.Mount) {
}
func
killSource
(
ctx
context
.
Context
,
m
*
pb
.
Mount
,
port
int
,
pw
string
)
error
{
v
ar
v
url
.
Values
v
:=
make
(
url
.
Values
)
v
.
Set
(
"mount"
,
autoradio
.
MountPathToIcecastPath
(
m
.
Path
))
req
,
err
:=
http
.
NewRequest
(
"GET"
,
fmt
.
Sprintf
(
"http://localhost:%d/admin/killsource?%s"
,
port
,
v
.
Encode
()),
nil
)
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment