Merge remote-tracking branch 'upstream/main'

This commit is contained in:
unknown 2024-03-08 22:29:24 +08:00
commit 9729e69bbf
2 changed files with 1 additions and 5 deletions

View File

@ -1795,10 +1795,6 @@ openim::util::stop_services_on_ports() {
return 0 return 0
fi fi
} }
# nc -l -p 12345
# nc -l -p 123456
# ps -ef | grep "nc -l"
# openim::util::stop_services_on_ports 1234 12345
# The `openim::util::stop_services_with_name` function stops services with specified names. # The `openim::util::stop_services_with_name` function stops services with specified names.

View File

@ -77,7 +77,7 @@ func main() {
err = configGetEnv(conf) err = configGetEnv(conf)
if err != nil { if err != nil {
fmt.Printf("configGetEnv failed,err:%v", err) fmt.Printf("configGetEnv failed, err:%v", err)
return return
} }