Merge pull request #50 from lnls-sirius/add-bl-ap-imgproc

Add bl ap imgproc

Makefile

@@ -255,6 +255,12 @@ service-start-as-ap-injctrl:
 	sed -i "s/fac-iocs:.*/fac-iocs:$(IMG_IOCS_TAG)/g" docker-stack-as-ap-injctrl.yml; \
 	docker stack deploy -c docker-stack-as-ap-injctrl.yml facs-as-ap-injctrl; \
 	sed -i "s/fac-iocs:.*/fac-iocs:__FAC_IOC_TAG_TEMPLATE__/g" docker-stack-as-ap-injctrl.yml
+service-start-bl-ap-imgproc:
+	cd services; \
+	sed -i "s/fac-iocs:.*/fac-iocs:$(IMG_IOCS_TAG)/g" docker-stack-bl-ap-imgproc.yml; \
+	docker stack deploy -c docker-stack-bl-ap-imgproc.yml facs-bl-ap-imgproc; \
+	sed -i "s/fac-iocs:.*/fac-iocs:__FAC_IOC_TAG_TEMPLATE__/g" docker-stack-bl-ap-imgproc.yml
+
 
 service-stop-as-ps-dclinks:
 	cd services; \
@@ -339,6 +345,11 @@ service-stop-as-ap-machshift:
 service-stop-as-ap-injctrl:
 	cd services; \
 	docker stack rm facs-as-ap-injctrl
+service-stop-bl-ap-imgproc:
+	cd services; \
+	docker stack rm facs-bl-ap-imgproc
+
+
 
 
 # --- all services at once ---
@@ -368,6 +379,7 @@ service-start-all:
 	docker stack deploy -c docker-stack-si-id.yml facs-si-id; \
 	docker stack deploy -c docker-stack-as-ap-machshift.yml facs-as-ap-machshift; \
 	docker stack deploy -c docker-stack-as-ap-injctrl.yml facs-as-ap-injctrl; \
+	docker stack deploy -c docker-stack-bl-ap-imgproc.yml facs-bl-ap-imgproc; \
 	sed -i "s/fac-iocs-li-ps:.*/fac-iocs-li-ps:__FAC_IOC_LI_PS_TAG_TEMPLATE__/g" docker-stack-li-ps.yml && \
 	find ./ -name "docker-*.yml" -exec sed -i "s/fac-iocs:.*/fac-iocs:__FAC_IOC_TAG_TEMPLATE__/g" {} \; && \
 
@@ -393,4 +405,5 @@ service-stop-all:
 	docker stack rm facs-si-ap-fofb; \
 	docker stack rm facs-si-id; \
 	docker stack rm facs-as-ap-machshift; \
-	docker stack rm facs-as-ap-injctrl
+	docker stack rm facs-as-ap-injctrl; \
+	docker stack rm facs-bl-ap-imgproc

apps/bl-ap-imgproc.bash

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+export PYTHONUNBUFFERED=yes
+
+# CPU usage estimate (ps aux):
+
+/usr/local/bin/sirius-ioc-bl-ap-imgproc-caxdvf2.py --devname CAX:B:BASLER01 \
+| tee /ioc-logs/sirius-ioc-bl-ap-imgproc-caxdvf2.log &
+
+# /usr/local/bin/sirius-ioc-bl-ap-imgproc-caxdvf1.py --devname CAX:A:BASLER01 \
+# | tee /ioc-logs/sirius-ioc-bl-ap-imgproc-caxdvf1.log &
+
+# run cron for log rotation
+cron &
+
+# keep entry point running
+sleep infinity

services/docker-stack-bl-ap-imgproc.yml

@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+
+  iocs:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/bl-ap-imgproc.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-18RaDiag04-CO-IOCSrv
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+networks:
+  ioc-network:
+    external: true
+    name: "host"

tools/generate_service_files.py

@@ -174,6 +174,7 @@ class ServiceConfig:
         'si-ps-conv-fastcorrs': 'IA-20RaDiag02-CO-IOCSrv-2',
         'si-ps-diag-fastcorrs': 'IA-20RaDiag02-CO-IOCSrv-2',
         'it-ps-lens': 'lnlsfac-srv2',
+        'bl-ap-imgproc': 'IA-18RaDiag04-CO-IOCSrv',
         }
 
     STACKS = {
@@ -361,6 +362,9 @@ class ServiceConfig:
             'conv': 'si-ps-conv-fastcorrs',
             'diag': 'si-ps-diag-fastcorrs',
             },
+        # 'bl-ap-imgproc': {
+        #     'imgproc': 'bl-ap-imgproc',
+        #     },
         }