aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-19 15:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

added possibility to specify the signal-cli command timeout in the

Browse Source 
docker-compose.yml file

see #145
This commit is contained in:
Bernhard B
2021-07-03 17:48:02 +02:00
parent 3d8133284e
commit 99b9d6163a
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/api.go
View File

@@ -347,6 +347,12 @@ func runSignalCli(wait bool, args []string, stdin string) (string, error) {
log.Debug("*) su signal-api")
log.Debug("*) ", fullCmd)
cmdTimeout, err := utils.GetIntEnv("SIGNAL_CLI_CMD_TIMEOUT", 60)
if err != nil {
log.Error("Env variable 'SIGNAL_CLI_CMD_TIMEOUT' contains an invalid timeout...falling back to default timeout (60 seconds)")
cmdTimeout = 60
}
cmd := exec.Command(signalCliBinary, args...)
if stdin != "" {
cmd.Stdin = strings.NewReader(stdin)
@@ -367,7 +373,7 @@ func runSignalCli(wait bool, args []string, stdin string) (string, error) {
done <- cmd.Wait()
}()
select {
case <-time.After(60 * time.Second):
case <-time.After(time.Duration(cmdTimeout) * time.Second):
err := cmd.Process.Kill()
if err != nil {
return "", err