Skip to content

Commit e2d770d

Browse files
authored
Fix missing node id prefix in startup logs (#29534)
When `node.name` is not set, some log traces at startup time does not show the node id.
1 parent 8afa7c1 commit e2d770d

File tree

1 file changed

+2
-3
lines changed
  • server/src/main/java/org/elasticsearch/node

1 file changed

+2
-3
lines changed

server/src/main/java/org/elasticsearch/node/Node.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ protected Node(final Environment environment, Collection<Class<? extends Plugin>
258258
// use temp logger just to say we are starting. we can't use it later on because the node name might not be set
259259
Logger logger = Loggers.getLogger(Node.class, NODE_NAME_SETTING.get(environment.settings()));
260260
logger.info("initializing ...");
261-
262261
}
263262
try {
264263
Settings tmpSettings = Settings.builder().put(environment.settings())
@@ -272,13 +271,13 @@ protected Node(final Environment environment, Collection<Class<? extends Plugin>
272271
throw new IllegalStateException("Failed to create node environment", ex);
273272
}
274273
final boolean hadPredefinedNodeName = NODE_NAME_SETTING.exists(tmpSettings);
275-
Logger logger = Loggers.getLogger(Node.class, tmpSettings);
276274
final String nodeId = nodeEnvironment.nodeId();
277275
tmpSettings = addNodeNameIfNeeded(tmpSettings, nodeId);
276+
final Logger logger = Loggers.getLogger(Node.class, tmpSettings);
278277
// this must be captured after the node name is possibly added to the settings
279278
final String nodeName = NODE_NAME_SETTING.get(tmpSettings);
280279
if (hadPredefinedNodeName == false) {
281-
logger.info("node name [{}] derived from node ID [{}]; set [{}] to override", nodeName, nodeId, NODE_NAME_SETTING.getKey());
280+
logger.info("node name derived from node ID [{}]; set [{}] to override", nodeId, NODE_NAME_SETTING.getKey());
282281
} else {
283282
logger.info("node name [{}], node ID [{}]", nodeName, nodeId);
284283
}

0 commit comments

Comments
 (0)