Skip to content

Commit 6a19a9d

Browse files
VietND96VietND96
committed
Print all info at last
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 7f256fd commit 6a19a9d

File tree

10 files changed

+41
-30
lines changed

10 files changed

+41
-30
lines changed

‎Distributor/start-selenium-grid-distributor.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ fi
151151

152152
EXTRA_LIBS=""
153153
if [ -n "${SE_EXTRA_LIBS}" ]; then
154-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
155154
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
156155
fi
157156

@@ -163,8 +162,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
163162
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
164163
fi
165164
echo "Tracing is enabled"
166-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
167-
168165
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
169166
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
170167
fi
@@ -186,6 +183,10 @@ else
186183
echo "Tracing is disabled"
187184
fi
188185

186+
if [ -n "${EXTRA_LIBS}" ]; then
187+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
188+
fi
189+
189190
if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
190191
SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
191192
fi

‎EventBus/start-selenium-grid-eventbus.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ fi
8181

8282
EXTRA_LIBS=""
8383
if [ -n "${SE_EXTRA_LIBS}" ]; then
84-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
8584
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
8685
fi
8786

@@ -93,8 +92,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9392
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
9493
fi
9594
echo "Tracing is enabled"
96-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
97-
9895
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
9996
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
10097
fi
@@ -116,6 +113,10 @@ else
116113
echo "Tracing is disabled"
117114
fi
118115

116+
if [ -n "${EXTRA_LIBS}" ]; then
117+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
118+
fi
119+
119120
if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
120121
SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
121122
fi

‎Hub/start-selenium-grid-hub.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ fi
131131

132132
EXTRA_LIBS=""
133133
if [ -n "${SE_EXTRA_LIBS}" ]; then
134-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
135134
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
136135
fi
137136

@@ -143,8 +142,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
143142
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
144143
fi
145144
echo "Tracing is enabled"
146-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
147-
148145
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
149146
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
150147
fi
@@ -166,6 +163,10 @@ else
166163
echo "Tracing is disabled"
167164
fi
168165

166+
if [ -n "${EXTRA_LIBS}" ]; then
167+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
168+
fi
169+
169170
if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
170171
SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
171172
fi

‎NodeBase/start-selenium-node.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ fi
130130

131131
EXTRA_LIBS=""
132132
if [ -n "${SE_EXTRA_LIBS}" ]; then
133-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
134133
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
135134
fi
136135

@@ -142,8 +141,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
142141
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
143142
fi
144143
echo "Tracing is enabled"
145-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
146-
147144
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
148145
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
149146
fi
@@ -165,6 +162,10 @@ else
165162
echo "Tracing is disabled"
166163
fi
167164

165+
if [ -n "${EXTRA_LIBS}" ]; then
166+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
167+
fi
168+
168169
if [ ! -z "${SE_BIND_HOST}" ]; then
169170
append_se_opts "--bind-host" "${SE_BIND_HOST}"
170171
fi

‎NodeDocker/start-selenium-grid-docker.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ cat "${CONFIG_FILE}"
9898

9999
EXTRA_LIBS=""
100100
if [ -n "${SE_EXTRA_LIBS}" ]; then
101-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
102101
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
103102
fi
104103

@@ -110,8 +109,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
110109
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
111110
fi
112111
echo "Tracing is enabled"
113-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
114-
115112
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
116113
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
117114
fi
@@ -133,6 +130,10 @@ else
133130
echo "Tracing is disabled"
134131
fi
135132

133+
if [ -n "${EXTRA_LIBS}" ]; then
134+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
135+
fi
136+
136137
if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
137138
SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
138139
fi

‎Router/start-selenium-grid-router.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ fi
132132

133133
EXTRA_LIBS=""
134134
if [ -n "${SE_EXTRA_LIBS}" ]; then
135-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
136135
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
137136
fi
138137

@@ -144,8 +143,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
144143
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
145144
fi
146145
echo "Tracing is enabled"
147-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
148-
149146
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
150147
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
151148
fi
@@ -167,6 +164,10 @@ else
167164
echo "Tracing is disabled"
168165
fi
169166

167+
if [ -n "${EXTRA_LIBS}" ]; then
168+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
169+
fi
170+
170171
if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
171172
SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
172173
fi

‎SessionQueue/start-selenium-grid-session-queue.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ fi
8585

8686
EXTRA_LIBS=""
8787
if [ -n "${SE_EXTRA_LIBS}" ]; then
88-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
8988
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
9089
fi
9190

@@ -97,8 +96,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9796
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
9897
fi
9998
echo "Tracing is enabled"
100-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
101-
10299
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
103100
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
104101
fi
@@ -120,6 +117,10 @@ else
120117
echo "Tracing is disabled"
121118
fi
122119

120+
if [ -n "${EXTRA_LIBS}" ]; then
121+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
122+
fi
123+
123124
if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
124125
SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
125126
fi

‎Sessions/start-selenium-grid-sessions.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ fi
107107

108108
EXTRA_LIBS=""
109109
if [ -n "${SE_EXTRA_LIBS}" ]; then
110-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
111110
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
112111
fi
113112

@@ -119,8 +118,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
119118
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
120119
fi
121120
echo "Tracing is enabled"
122-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
123-
124121
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
125122
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
126123
fi
@@ -143,6 +140,7 @@ else
143140
fi
144141

145142
if [ "${SE_SESSIONS_MAP_EXTERNAL_DATASTORE}" = "true" ]; then
143+
echo "External datastore for sessions map is enabled"
146144
EXTERNAL_JARS=$(</external_jars/.classpath_session_map.txt)
147145
if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
148146
EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
@@ -151,6 +149,10 @@ if [ "${SE_SESSIONS_MAP_EXTERNAL_DATASTORE}" = "true" ]; then
151149
fi
152150
fi
153151

152+
if [ -n "${EXTRA_LIBS}" ]; then
153+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
154+
fi
155+
154156
cat "$CONFIG_FILE"
155157
echo "Starting Selenium Grid Sessions..."
156158

‎Standalone/start-selenium-standalone.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ echo "Starting Selenium Grid Standalone..."
130130

131131
EXTRA_LIBS=""
132132
if [ -n "${SE_EXTRA_LIBS}" ]; then
133-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
134133
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
135134
fi
136135

@@ -142,8 +141,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
142141
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
143142
fi
144143
echo "Tracing is enabled"
145-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
146-
147144
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
148145
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
149146
fi
@@ -165,6 +162,10 @@ else
165162
echo "Tracing is disabled"
166163
fi
167164

165+
if [ -n "${EXTRA_LIBS}" ]; then
166+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
167+
fi
168+
168169
CHROME_DRIVER_PATH_PROPERTY=-Dwebdriver.chrome.driver=/usr/bin/chromedriver
169170
EDGE_DRIVER_PATH_PROPERTY=-Dwebdriver.edge.driver=/usr/bin/msedgedriver
170171
GECKO_DRIVER_PATH_PROPERTY=-Dwebdriver.gecko.driver=/usr/bin/geckodriver

‎StandaloneDocker/start-selenium-grid-docker.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ cat "${CONFIG_FILE}"
103103

104104
EXTRA_LIBS=""
105105
if [ -n "${SE_EXTRA_LIBS}" ]; then
106-
echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
107106
EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
108107
fi
109108

@@ -115,8 +114,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
115114
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
116115
fi
117116
echo "Tracing is enabled"
118-
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
119-
120117
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
121118
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
122119
fi
@@ -138,6 +135,10 @@ else
138135
echo "Tracing is disabled"
139136
fi
140137

138+
if [ -n "${EXTRA_LIBS}" ]; then
139+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
140+
fi
141+
141142
if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
142143
SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
143144
fi

0 commit comments

Comments
 (0)