Skip to content

Commit fe5185f

Browse files
committed
fix(docker): enable docker logs for pd/store/server containers
1 parent 9126c80 commit fe5185f

7 files changed

Lines changed: 8 additions & 8 deletions

File tree

hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ JVM_OPTIONS="-Dlog4j.configurationFile=${CONF}/log4j2.xml -Djava.util.logging.ma
169169

170170
# Turn on security check
171171
exec ${JAVA} -Dname="HugeGraphPD" ${JVM_OPTIONS} ${JAVA_OPTIONS} -jar \
172-
-Dspring.config.location=${CONF}/application.yml ${LIB}/hg-pd-service-*.jar >> ${OUTPUT} 2>&1 &
172+
-Dspring.config.location=${CONF}/application.yml ${LIB}/hg-pd-service-*.jar &
173173

174174
PID="$!"
175175
# Write pid to file

hugegraph-pd/hg-pd-dist/src/assembly/static/conf/log4j2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115

116116
<loggers>
117117
<root level="INFO">
118+
<appender-ref ref="console" />
118119
<appender-ref ref="file" />
119120
</root>
120121
<logger name="com.alipay.sofa" level="INFO" additivity="false">

hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,4 @@ fi
184184

185185
# Turn on security check
186186
exec ${JAVA} -Dname="HugeGraphServer" ${JVM_OPTIONS} ${JAVA_OPTIONS} -cp ${CLASSPATH}: \
187-
org.apache.hugegraph.dist.HugeGraphServer ${GREMLIN_SERVER_CONF} ${REST_SERVER_CONF} \
188-
>> ${OUTPUT} 2>&1
187+
org.apache.hugegraph.dist.HugeGraphServer ${GREMLIN_SERVER_CONF} ${REST_SERVER_CONF}

hugegraph-server/hugegraph-dist/src/assembly/static/bin/start-hugegraph.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,11 @@ fi
103103
if [[ $DAEMON == "true" ]]; then
104104
echo "Starting HugeGraphServer in daemon mode..."
105105
"${BIN}"/hugegraph-server.sh "${CONF}/${GREMLIN_SERVER_CONF}" "${CONF}"/rest-server.properties \
106-
"${OPEN_SECURITY_CHECK}" "${USER_OPTION}" "${GC_OPTION}" "${OPEN_TELEMETRY}" \
107-
>>"${LOGS}"/hugegraph-server.log 2>&1 &
106+
"${OPEN_SECURITY_CHECK}" "${USER_OPTION}" "${GC_OPTION}" "${OPEN_TELEMETRY}" &
108107
else
109108
echo "Starting HugeGraphServer in foreground mode..."
110109
"${BIN}"/hugegraph-server.sh "${CONF}/${GREMLIN_SERVER_CONF}" "${CONF}"/rest-server.properties \
111-
"${OPEN_SECURITY_CHECK}" "${USER_OPTION}" "${GC_OPTION}" "${OPEN_TELEMETRY}" \
112-
>>"${LOGS}"/hugegraph-server.log 2>&1
110+
"${OPEN_SECURITY_CHECK}" "${USER_OPTION}" "${GC_OPTION}" "${OPEN_TELEMETRY}"
113111
fi
114112

115113
PID="$!"

hugegraph-server/hugegraph-dist/src/assembly/static/conf/log4j2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104

105105
<loggers>
106106
<root level="INFO">
107+
<appender-ref ref="console"/>
107108
<appender-ref ref="file"/>
108109
</root>
109110
<logger name="org.apache.cassandra" level="INFO" additivity="false">

hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ echo "Starting HG-StoreServer..."
223223

224224
exec ${JAVA} -Dname="HugeGraphStore" ${JVM_OPTIONS} ${JAVA_OPTIONS} -jar \
225225
-Dspring.config.location=${CONF}/application.yml \
226-
${LIB}/hg-store-node-*.jar >> ${OUTPUT} 2>&1 &
226+
${LIB}/hg-store-node-*.jar &
227227

228228
PID="$!"
229229
# Write pid to file

hugegraph-store/hg-store-dist/src/assembly/static/conf/log4j2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117

118118
<loggers>
119119
<root level="INFO">
120+
<appender-ref ref="console"/>
120121
<appender-ref ref="file"/>
121122
</root>
122123
<logger name="com.alipay.sofa" level="INFO" additivity="false">

0 commit comments

Comments
 (0)