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

fixed bug in json-rpc mode

Browse Source 
* do not hardcode path to signal-cli config directory in supervisor
  config file.
This commit is contained in:
Bernhard B
2021-11-06 22:49:25 +01:00
parent e5d170eaf6
commit f8f601a498
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripts/jsonrpc2-helper.go
View File

@@ -16,7 +16,7 @@ const supervisorctlConfigTemplate = `
[program:%s] [program:%s]
environment=JAVA_HOME=/opt/java/openjdk environment=JAVA_HOME=/opt/java/openjdk
process_name=%s process_name=%s
command=bash -c "nc -l -p %d <%s | signal-cli --output=json -u %s --config /home/.local/share/signal-cli/ jsonRpc >%s" command=bash -c "nc -l -p %d <%s | signal-cli --output=json -u %s --config %s jsonRpc >%s"
autostart=true autostart=true
autorestart=true autorestart=true
startretries=10 startretries=10
@@ -90,7 +90,7 @@ func main() {
//write supervisorctl config //write supervisorctl config
supervisorctlConfigFilename := "/etc/supervisor/conf.d/" + "signal-cli-json-rpc-" + strconv.FormatInt(ctr, 10) + ".conf" supervisorctlConfigFilename := "/etc/supervisor/conf.d/" + "signal-cli-json-rpc-" + strconv.FormatInt(ctr, 10) + ".conf"
supervisorctlConfig := fmt.Sprintf(supervisorctlConfigTemplate, supervisorctlProgramName, supervisorctlProgramName, supervisorctlConfig := fmt.Sprintf(supervisorctlConfigTemplate, supervisorctlProgramName, supervisorctlProgramName,
tcpPort, fifoPathname, number, fifoPathname, supervisorctlProgramName, supervisorctlProgramName) tcpPort, fifoPathname, number, signalCliConfigDir, fifoPathname, supervisorctlProgramName, supervisorctlProgramName)
err = ioutil.WriteFile(supervisorctlConfigFilename, []byte(supervisorctlConfig), 0644) err = ioutil.WriteFile(supervisorctlConfigFilename, []byte(supervisorctlConfig), 0644)
if err != nil { if err != nil {
log.Fatal("Couldn't write ", supervisorctlConfigFilename, ": ", err.Error()) log.Fatal("Couldn't write ", supervisorctlConfigFilename, ": ", err.Error())