Display the port services listen to from OAP and UI (#12030)
This commit is contained in:
SheltonZSL
GitHub
parent
121e8d29f0
commit
935ab0b17d
|
|
@ -32,12 +32,22 @@
|
|||
</Policies>
|
||||
<DefaultRolloverStrategy max="30"/>
|
||||
</RollingFile>
|
||||
<Console name="Console" target="SYSTEM_OUT">
|
||||
<PatternLayout>
|
||||
<pattern>%m%n</pattern>
|
||||
</PatternLayout>
|
||||
<MarkerFilter marker="Console" onMatch="ACCEPT" onMismatch="DENY"/>
|
||||
</Console>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<logger name="org.apache.zookeeper" level="INFO"/>
|
||||
<logger name="io.grpc.netty" level="INFO"/>
|
||||
<Logger name="org.apache.skywalking.oap.server.webapp.ApplicationStartUp" level="INFO" additivity="false">
|
||||
<AppenderRef ref="Console"/>
|
||||
</Logger>
|
||||
<Root level="info">
|
||||
<AppenderRef ref="RollingFile"/>
|
||||
<AppenderRef ref="Console"/>
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
|
|
|
|||
|
|
@ -21,6 +21,9 @@ package org.apache.skywalking.oap.server.webapp;
|
|||
import static org.yaml.snakeyaml.env.EnvScalarConstructor.ENV_FORMAT;
|
||||
import static org.yaml.snakeyaml.env.EnvScalarConstructor.ENV_TAG;
|
||||
import java.util.Collections;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.slf4j.Marker;
|
||||
import org.slf4j.MarkerFactory;
|
||||
import org.yaml.snakeyaml.LoaderOptions;
|
||||
import org.yaml.snakeyaml.TypeDescription;
|
||||
import org.yaml.snakeyaml.Yaml;
|
||||
|
|
@ -32,8 +35,10 @@ import com.linecorp.armeria.server.file.FileService;
|
|||
import com.linecorp.armeria.server.file.HttpFile;
|
||||
import com.linecorp.armeria.server.healthcheck.HealthCheckService;
|
||||
|
||||
@Slf4j
|
||||
public class ApplicationStartUp {
|
||||
public static void main(String[] args) throws Exception {
|
||||
final Marker startedMarker = MarkerFactory.getMarker("Console");
|
||||
final Yaml yaml = new Yaml(
|
||||
new EnvScalarConstructor(
|
||||
new TypeDescription(Configuration.class),
|
||||
|
|
@ -79,5 +84,9 @@ public class ApplicationStartUp {
|
|||
.build()
|
||||
.start()
|
||||
.join();
|
||||
|
||||
log.info(startedMarker, "SkyWalking Booster UI is now running. " +
|
||||
"OAP service at {} and Booster UI at http://localhost:{}",
|
||||
String.join(", ", oapServices), port);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,4 +43,4 @@ done
|
|||
OAP_OPTIONS=" -Doap.logDir=${OAP_LOG_DIR}"
|
||||
|
||||
eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} ${OAP_OPTIONS} -classpath $CLASSPATH org.apache.skywalking.oap.server.starter.OAPServerStartUp \
|
||||
2>${OAP_LOG_DIR}/oap.log 1> /dev/null"
|
||||
2>${OAP_LOG_DIR}/oap.log"
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ PRGDIR=`dirname "$PRG"`
|
|||
OAP_EXE=oapService.sh
|
||||
WEBAPP_EXE=webappService.sh
|
||||
|
||||
"$PRGDIR"/"$OAP_EXE" &
|
||||
"$PRGDIR"/"$OAP_EXE" 1> /dev/null &
|
||||
|
||||
"$PRGDIR"/"$WEBAPP_EXE" &
|
||||
"$PRGDIR"/"$WEBAPP_EXE" 1> /dev/null &
|
||||
|
|
|
|||
|
|
@ -34,5 +34,5 @@ _RUNJAVA=${JAVA_HOME}/bin/java
|
|||
|
||||
eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -cp ${JAR_PATH}/skywalking-webapp.jar:$JAR_PATH \
|
||||
org.apache.skywalking.oap.server.webapp.ApplicationStartUp \
|
||||
2>${WEBAPP_LOG_DIR}/webapp-console.log 1> /dev/null"
|
||||
2>${WEBAPP_LOG_DIR}/webapp-console.log"
|
||||
|
||||
|
|
|
|||
|
|
@ -32,12 +32,22 @@
|
|||
</Policies>
|
||||
<DefaultRolloverStrategy max="30"/>
|
||||
</RollingFile>
|
||||
<Console name="Console" target="SYSTEM_OUT">
|
||||
<PatternLayout>
|
||||
<pattern>%m%n</pattern>
|
||||
</PatternLayout>
|
||||
<MarkerFilter marker="Console" onMatch="ACCEPT" onMismatch="DENY"/>
|
||||
</Console>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<logger name="org.apache.zookeeper" level="INFO"/>
|
||||
<logger name="io.grpc.netty" level="INFO"/>
|
||||
<Logger name="org.apache.skywalking.oap.server.library.server.grpc.GRPCServer" level="INFO" additivity="false">
|
||||
<AppenderRef ref="Console"/>
|
||||
</Logger>
|
||||
<Root level="info">
|
||||
<AppenderRef ref="RollingFile"/>
|
||||
<AppenderRef ref="Console"/>
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@
|
|||
- PULSAR -> K8S_SERVICE
|
||||
- VIRTUAL_MQ -> PULSAR
|
||||
* Add Golang as a supported language for Kafka.
|
||||
* Support displaying the port services listen to from OAP and UI during server start.
|
||||
|
||||
#### UI
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ import java.util.concurrent.SynchronousQueue;
|
|||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.slf4j.Marker;
|
||||
import org.slf4j.MarkerFactory;
|
||||
import org.apache.skywalking.oap.server.library.server.Server;
|
||||
import org.apache.skywalking.oap.server.library.server.ServerException;
|
||||
import org.apache.skywalking.oap.server.library.server.grpc.ssl.DynamicSslContext;
|
||||
|
|
@ -51,6 +53,7 @@ public class GRPCServer implements Server {
|
|||
private String trustedCAsFile;
|
||||
private DynamicSslContext sslContext;
|
||||
private int threadPoolSize;
|
||||
private static final Marker SERVER_START_MARKER = MarkerFactory.getMarker("Console");
|
||||
|
||||
public GRPCServer(String host, int port) {
|
||||
this.host = host;
|
||||
|
|
@ -105,7 +108,7 @@ public class GRPCServer implements Server {
|
|||
sslContext = DynamicSslContext.forServer(privateKeyFile, certChainFile, trustedCAsFile);
|
||||
nettyServerBuilder.sslContext(sslContext);
|
||||
}
|
||||
log.info("Server started, host {} listening on {}", host, port);
|
||||
log.info(SERVER_START_MARKER, "Server started, host {} listening on {}", host, port);
|
||||
}
|
||||
|
||||
static class CustomRejectedExecutionHandler implements RejectedExecutionHandler {
|
||||
|
|
|
|||
Loading…
Reference in New Issue