@@ -10,13 +10,9 @@ metadata:
10
10
data :
11
11
liveness-probe.sh : |
12
12
#!/bin/bash
13
- pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
14
13
log () {
15
14
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
16
- # Check to make sure pod doesn't terminate if PID value is empty for any reason
17
- if [ -n "$pid" ]; then
18
- echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
19
- fi
15
+ echo "${TIMESTAMP} $@" > /proc/1/fd/1
20
16
}
21
17
22
18
# Check if ML service is running. Exit with 1 if it is other than running
@@ -118,15 +114,9 @@ data:
118
114
MARKLOGIC_ADMIN_USERNAME="$(< /run/secrets/ml-secrets/username)"
119
115
MARKLOGIC_ADMIN_PASSWORD="$(< /run/secrets/ml-secrets/password)"
120
116
121
- pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
122
-
123
117
log () {
124
118
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
125
- # Check to make sure pod doesn't terminate if PID value is empty for any reason
126
- # If PID value is empty preStart hook logs are not recorded
127
- if [ -n "$pid" ]; then
128
- echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
129
- fi
119
+ echo "${TIMESTAMP} $@" > /proc/1/fd/1
130
120
}
131
121
132
122
log "Info: [prestop] Prestop Hook Execution"
@@ -195,8 +185,6 @@ data:
195
185
echo "IS_BOOTSTRAP_HOST false"
196
186
fi
197
187
198
- pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
199
-
200
188
###############################################################
201
189
# Logging utility
202
190
###############################################################
@@ -215,13 +203,8 @@ data:
215
203
216
204
log () {
217
205
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
218
- # Check to make sure pod doesn't terminate if PID value is empty for any reason
219
- # If PID value is empty postStart hook logs are not recorded
220
206
message="${TIMESTAMP} [postStart] $@"
221
- if [ -n "$pid" ]; then
222
- echo $message > /proc/$pid/fd/1
223
- fi
224
-
207
+ echo $message > /proc/1/fd/1
225
208
echo $message >> /tmp/script.log
226
209
}
227
210
@@ -889,13 +872,8 @@ data:
889
872
#!/bin/bash
890
873
log () {
891
874
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
892
- # Check to make sure pod doesn't terminate if PID value is empty for any reason
893
- if [ -n "$pid" ]; then
894
- echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
895
- fi
875
+ echo "${TIMESTAMP} $@" > /proc/1/fd/1
896
876
}
897
-
898
- pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
899
877
900
878
log "Info: [root-rootless-upgrade] Execution Start"
901
879
0 commit comments