diff --git a/config/config.yaml b/config/config.yaml index c23b094ff..c042bd3ff 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -29,8 +29,8 @@ zookeeper: schema: openim address: [ 127.0.0.1:2181 ] - username: - password: + username: '' + password: '' ###################### Mysql ###################### # MySQL configuration @@ -60,7 +60,7 @@ mysql: # Default MongoDB database name # Maximum connection pool size mongo: - uri: + uri: '' address: [ 127.0.0.1:37017 ] database: openIM_v3 username: root @@ -73,7 +73,7 @@ mongo: # Username is required only for Redis version 6.0+ redis: address: [ 127.0.0.1:16379 ] - username: + username: '' password: openIM123 ###################### Kafka configuration information ###################### @@ -84,8 +84,8 @@ redis: # It's not recommended to modify this topic name # Consumer group ID, it's not recommended to modify kafka: - username: - password: + username: '' + password: '' addr: [ 127.0.0.1:9092 ] latestMsgToRedis: topic: "latestMsgToRedis" @@ -105,7 +105,7 @@ kafka: # IP address to register with zookeeper when starting RPC, the IP and corresponding rpcPort should be accessible by api/gateway # Default listen IP is 0.0.0.0 rpc: - registerIP: + registerIP: '' listenIP: 0.0.0.0 ###################### API configuration information ###################### @@ -132,26 +132,27 @@ api: # minio.signEndpoint is minio public network address object: enable: "minio" - apiURL: "http://127.0.0.1:10002" + apiURL: "http://14.153.17.42:10002" minio: bucket: "openim" endpoint: "http://127.0.0.1:10005" accessKeyID: "root" secretAccessKey: "openIM123" - sessionToken: "" - signEndpoint: "http://127.0.0.1:10005" + sessionToken: '' + signEndpoint: "http://14.153.17.42:10005" cos: - bucketURL: "https://temp-1252357374.cos.ap-chengdu.myqcloud.com" - secretID: "" - secretKey: "" - sessionToken: "" + bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com + secretID: '' + secretKey: '' + sessionToken: '' oss: endpoint: "https://oss-cn-chengdu.aliyuncs.com" bucket: "demo-9999999" bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com" - accessKeyID: "" - accessKeySecret: "" - sessionToken: "" + accessKeyID: '' + accessKeySecret: '' + sessionToken: '' + ###################### RPC Port Configuration ###################### # RPC service ports @@ -193,11 +194,11 @@ rpcRegisterName: # Whether to output in json format # Whether to include stack trace in logs log: - storageLocation: ../../../../../logs/ + storageLocation: /root/workspaces/openim/openim-server/logs/ rotationTime: 24 remainRotationCount: 2 remainLogLevel: 6 - isStdout: false + isStdout: false isJson: false withStack: false diff --git a/scripts/docker-start-all.sh b/scripts/docker-start-all.sh index f87f4689f..9cfd88324 100755 --- a/scripts/docker-start-all.sh +++ b/scripts/docker-start-all.sh @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +set -o errexit +set -o nounset +set -o pipefail + #fixme This scripts is the total startup scripts #fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array @@ -22,10 +26,7 @@ source "${OPENIM_ROOT}/scripts/install/common.sh" trap 'openim::util::onCtrlC' INT -nohup "${OPENIM_ROOT}"/scripts/start-all.sh >> ${LOG_FILE} 2>&1 & - -sleep 15 - -nohup "${OPENIM_ROOT}"/scripts/check-all.sh >> ${LOG_FILE} 2>&1 & +"${OPENIM_ROOT}"/scripts/start-all.sh +"${OPENIM_ROOT}"/scripts/check-all.sh tail -f ${LOG_FILE} \ No newline at end of file diff --git a/scripts/install/openim-tools.sh b/scripts/install/openim-tools.sh index a0c67d3d2..81291c38d 100755 --- a/scripts/install/openim-tools.sh +++ b/scripts/install/openim-tools.sh @@ -102,7 +102,7 @@ function openim::tools::start_service() { cmd="${cmd} --prometheus_port ${prometheus_port}" fi openim::log::info "Starting ${binary_name}..." - ${cmd} >> "${LOG_FILE}" 2>&1 & + ${cmd} } function openim::tools::start() { diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh index 7dc0c0c2a..24b5081a4 100755 --- a/scripts/lib/logging.sh +++ b/scripts/lib/logging.sh @@ -212,12 +212,12 @@ openim::log::success() function openim::log::test_log() { echo_log "test log" - openim::log::error "openim::log::error" openim::log::info "openim::log::info" openim::log::progress "openim::log::progress" openim::log::status "openim::log::status" openim::log::success "openim::log::success" + openim::log::error "openim::log::error" openim::log::error_exit "openim::log::error_exit" } -# openim::log::test_log \ No newline at end of file +openim::log::test_log \ No newline at end of file diff --git a/scripts/start-all.sh b/scripts/start-all.sh index 2961d44f7..f75c92505 100755 --- a/scripts/start-all.sh +++ b/scripts/start-all.sh @@ -61,10 +61,11 @@ function execute_scripts() { else openim::log::errexit "Script ${script_path##*/} is missing or not executable." fi - sleep 0.5 done } +sleep 0.5 + # TODO Prelaunch tools, simple for now, can abstract functions later TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start