nik/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/bbernhard/signal-cli-rest-api.git synced 2026-05-25 14:34:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 63b3160567df5cb40a34e6ad7dbfd44842bd1183 into af34a0881c5ae4efa727e4389251305508ab6a57

Browse Source
This commit is contained in:
Evan Hahn 2026-03-06 08:43:47 -06:00 committed by GitHub
commit 4508bc3acb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/cli.go
View File

@ -89,6 +89,10 @@ func (s *CliClient) Execute(wait bool, args []string, stdin string) (string, err
args = append([]string{"--trust-new-identities", trustModeStr}, args...)
}
if log.GetLevel() >= log.DebugLevel {
args = append([]string{"--verbose"}, args...)
}
fullCmd := ""
if stdin != "" {
fullCmd += "echo '" + stdin + "' | "

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

@ -14,7 +14,7 @@ import (
const supervisorctlConfigTemplate = `
[program:%s]
process_name=%s
command=signal-cli --output=json --config %s%s daemon %s%s --tcp 127.0.0.1:%d
command=signal-cli%s --output=json --config %s%s daemon %s%s --tcp 127.0.0.1:%d
autostart=true
autorestart=true
startretries=10
@ -78,6 +78,11 @@ func main() {
log.Fatal("Couldn't create log folder ", supervisorctlLogFolder, ": ", err.Error())
}
verbose := ""
if utils.GetEnv("LOG_LEVEL", "") == "debug" {
verbose = " --verbose"
}
trustNewIdentities := ""
trustNewIdentitiesEnv := utils.GetEnv("JSON_RPC_TRUST_NEW_IDENTITIES", "")
if trustNewIdentitiesEnv == "on-first-use" {
@ -96,7 +101,7 @@ func main() {
supervisorctlConfigFilename := "/etc/supervisor/conf.d/" + "signal-cli-json-rpc-1.conf"
supervisorctlConfig := fmt.Sprintf(supervisorctlConfigTemplate, supervisorctlProgramName, supervisorctlProgramName,
signalCliConfigDir, trustNewIdentities, signalCliIgnoreAttachments, signalCliIgnoreStories, tcpPort,
verbose, signalCliConfigDir, trustNewIdentities, signalCliIgnoreAttachments, signalCliIgnoreStories, tcpPort,
supervisorctlProgramName, supervisorctlProgramName)
err = ioutil.WriteFile(supervisorctlConfigFilename, []byte(supervisorctlConfig), 0644)