significant tidying to logserver

logclient/start.sh

@@ -2,21 +2,20 @@
 source "${AGENT_PATH}/common.sh"
 _check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG"
 
-# Define volume names if not set
-CONFIG_VOLUME="${CONFIG_VOLUME:-${CONTAINER_NAME}_config}"
-DATA_VOLUME="${DATA_VOLUME:-${CONTAINER_NAME}_data}"
-CERTS_VOLUME="${CERTS_VOLUME:-${CONTAINER_NAME}_certs}"
+# Check that config file exists
+if [ ! -f "${CONFIG_PATH}/filebeat.yml" ]; then
+    _die "filebeat.yml not found in ${CONFIG_PATH}/filebeat.yml"
+fi
 
 # Create Docker command
-cmd="docker run -d \
+DOCKER_RUN_CMD="docker run -d \
     --name $CONTAINER_NAME \
     --restart unless-stopped \
     --user root \
     -v /var/run/docker.sock:/var/run/docker.sock:ro \
     -v /var/log:/var/log:ro \
-    -v ${CONFIG_VOLUME}:/usr/share/filebeat/config:ro \
+    -v ${CONFIG_PATH}:/usr/share/filebeat/config:ro \
     -v ${DATA_VOLUME}:/usr/share/filebeat/data \
-    -v ${CERTS_VOLUME}:/usr/share/filebeat/certs:ro \
     -e LOGSERVER_HOST=${LOGSERVER_HOST} \
     -e LOGSERVER_PORT=${LOGSERVER_PORT} \
     -e API_KEY=${API_KEY} \
@@ -24,7 +23,13 @@ cmd="docker run -d \
     filebeat -e -strict.perms=false \
     -c /usr/share/filebeat/config/filebeat.yml"
 
-# Start the container
-eval "$cmd" || _die "Failed to start Filebeat container"
+if ! _create_and_start_container "$DOCKER_RUN_CMD" "$CONTAINER_NAME"; then
+    _die "Failed to start container ${CONTAINER_NAME}"
+fi
 
-echo "Filebeat started successfully"
+# Check if the container is running
+if ! _is_container_running "$CONTAINER_NAME"; then
+    _die "Container ${CONTAINER_NAME} is not running"
+fi
+
+echo "Container ${CONTAINER_NAME} started"