Code Review
/
ta
/
caas-logging.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Simplify ElasticSearch to make it more robust
[ta/caas-logging.git]
/
docker-build
/
elasticsearch
/
elasticsearch-logrotate.sh
diff --git
a/docker-build/elasticsearch/elasticsearch-logrotate.sh
b/docker-build/elasticsearch/elasticsearch-logrotate.sh
index
989aedb
..
06e36e7
100755
(executable)
--- a/
docker-build/elasticsearch/elasticsearch-logrotate.sh
+++ b/
docker-build/elasticsearch/elasticsearch-logrotate.sh
@@
-15,7
+15,7
@@
FS_LIMIT=80
DOCS_DROP=100000
FS_LIMIT=80
DOCS_DROP=100000
-ES_URL="http://localhost:$ELASTICSEARCH_
LOGGING_
SERVICE_PORT"
+ES_URL="http://localhost:$ELASTICSEARCH_SERVICE_PORT"
log () {
echo "LOGROTATE: $*" >/proc/1/fd/1
log () {
echo "LOGROTATE: $*" >/proc/1/fd/1
@@
-23,13
+23,7
@@
log () {
log "hourly job started"
log "hourly job started"
-IFS='-' read es type num <<< "$HOSTNAME"
-if [[ "$type" != "data" ]]; then
- log "non-data node -> exiting"
- exit 0
-fi
-
-# sleep to avoid concurrent runs across multiple ES data Pods
+# sleep to avoid concurrent runs across multiple ES Pods
let "SLEEP=($num * 600)+($RANDOM % 30)"
log "sleeping $SLEEP seconds..."
sleep $SLEEP
let "SLEEP=($num * 600)+($RANDOM % 30)"
log "sleeping $SLEEP seconds..."
sleep $SLEEP