Skip to content

Commit

Permalink
- novo servico agendador
Browse files Browse the repository at this point in the history
- incremento e geracao de todos os servicos na 1.7
- build deploy e build-test para agendador
- bug na instalacao do sqlserver devido ao vencimento do suporte ao php7.3 ser antigo
- adicao do agendador no docker-compose
- adicao do agendador no kubernetes
- opcao de usar gearman e supervisor no agendador para o Modulo Barramento
  • Loading branch information
marlinhares committed Apr 5, 2023
1 parent 27cc4bb commit 59aa201
Show file tree
Hide file tree
Showing 28 changed files with 1,418 additions and 10 deletions.
28 changes: 25 additions & 3 deletions containers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ verificar-imagem-base-oracle: ## target de apoio para verificar se a imagem base
@if [ -z "$(IMAGEM_BASE_ORACLE_VERSAO)" ]; then echo "Var IMAGEM_BASE_ORACLE_VERSAO nao definida"; exit 1; fi


verificar-imagem-base-app-agendador: ## target de apoio para verificar se a imagem base do app-agendador foi informada
@if [ -z "$(IMAGEM_BASE_APP_AGENDADOR)" ]; then echo "Var IMAGEM_BASE_APP_AGENDADOR nao definida"; make envcontainers.env; fi
@if [ -z "$(IMAGEM_BASE_APP_AGENDADOR_VERSAO)" ]; then echo "Var IMAGEM_BASE_APP_AGENDADOR_VERSAO nao definida"; exit 1; fi


verificar-imagem-base-app: ## target de apoio para verificar se a imagem base do app foi informada
@if [ -z "$(IMAGEM_BASE_APP)" ]; then echo "Var IMAGEM_BASE_APP nao definida"; make envcontainers.env; fi
@if [ -z "$(IMAGEM_BASE_APP_VERSAO)" ]; then echo "Var IMAGEM_BASE_APP_VERSAO nao definida"; exit 1; fi
Expand Down Expand Up @@ -176,6 +181,10 @@ erase-conteiner-app-dev: ## apagar a imagem app-dev
@make IMAGEMTMP=app-dev IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic


erase-conteiner-app-ci-agendador: ## apagar a imagem app-ci-agendador
@make IMAGEMTMP=app-ci-agendador IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic


erase-conteiner-app-ci: ## apagar a imagem app-ci
@make IMAGEMTMP=app-ci IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic

Expand Down Expand Up @@ -212,7 +221,7 @@ erase-conteiner-dbadminer: ## apagar a imagem dbadminer
@make IMAGEMTMP=dbadminer IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic

## erase-conteiners-local: target que chama todos os outros targets para apagar as imagens do projeto
erase-conteiners-local: erase-conteiner-app-ci erase-conteiner-app-dev erase-conteiner-base-app erase-conteiner-solr erase-conteiner-memcached erase-conteiner-jod erase-conteiner-mailcatcher erase-conteiner-mariadb erase-conteiner-base-mariadb erase-conteiner-sqlserver erase-conteiner-base-sqlserver erase-conteiner-oracle erase-conteiner-base-oracle erase-conteiner-base-centos erase-conteiner-phpmemcachedadmin erase-conteiner-phpmemcachedadmin-base erase-conteiner-openldap erase-conteiner-openldap-base erase-conteiner-haproxy erase-conteiner-haproxy-base erase-conteiner-phpldapadmin erase-conteiner-dbadminer
erase-conteiners-local: erase-conteiner-app-ci-agendador erase-conteiner-app-ci erase-conteiner-app-dev erase-conteiner-base-app erase-conteiner-solr erase-conteiner-memcached erase-conteiner-jod erase-conteiner-mailcatcher erase-conteiner-mariadb erase-conteiner-base-mariadb erase-conteiner-sqlserver erase-conteiner-base-sqlserver erase-conteiner-oracle erase-conteiner-base-oracle erase-conteiner-base-centos erase-conteiner-phpmemcachedadmin erase-conteiner-phpmemcachedadmin-base erase-conteiner-openldap erase-conteiner-openldap-base erase-conteiner-haproxy erase-conteiner-haproxy-base erase-conteiner-phpldapadmin erase-conteiner-dbadminer


#*****************************************************
Expand Down Expand Up @@ -342,6 +351,15 @@ build-conteiner-app-ci: verificar-imagem-base-app verificar-git-parameters
build-conteiner-generic


## build-conteiner-app-ci-agendador construir imagem app-ci-agendador
build-conteiner-app-ci-agendador: verificar-imagem-base-app-agendador
@make IMAGEMTMP=app-ci-agendador \
IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) \
IMAGEMTMP_PATH=app/app-ci-agendador \
BUILD_ARGS=--build-arg\ IMAGEM_BASE=$(IMAGEM_BASE_APP_AGENDADOR):$(IMAGEM_BASE_APP_AGENDADOR_VERSAO) \
build-conteiner-generic


## build-conteiner-haproxy-base construir imagem haproxy-base
build-conteiner-haproxy-base:
@make IMAGEMTMP=haproxy-base \
Expand Down Expand Up @@ -405,7 +423,7 @@ build-conteiner-dbadminer: ## construir imagem dbadminer


## build-conteiners: roda todos os outros targets de build na sequencia
build-conteiners: verificar-git-parameters build-conteiner-base-centos build-conteiner-memcached build-conteiner-jod build-conteiner-mailcatcher build-conteiner-base-mariadb build-conteiner-mariadb build-conteiner-base-sqlserver build-conteiner-sqlserver build-conteiner-base-oracle build-conteiner-oracle build-conteiner-solr build-conteiner-base-app build-conteiner-app-dev build-conteiner-app-ci build-conteiner-phpmemcachedadmin-base build-conteiner-phpmemcachedadmin build-conteiner-openldap-base build-conteiner-openldap build-conteiner-haproxy-base build-conteiner-haproxy build-conteiner-phpldapadmin build-conteiner-dbadminer
build-conteiners: verificar-git-parameters build-conteiner-base-centos build-conteiner-memcached build-conteiner-jod build-conteiner-mailcatcher build-conteiner-base-mariadb build-conteiner-mariadb build-conteiner-base-sqlserver build-conteiner-sqlserver build-conteiner-base-oracle build-conteiner-oracle build-conteiner-solr build-conteiner-base-app build-conteiner-app-dev build-conteiner-app-ci build-conteiner-app-ci-agendador build-conteiner-phpmemcachedadmin-base build-conteiner-phpmemcachedadmin build-conteiner-openldap-base build-conteiner-openldap build-conteiner-haproxy-base build-conteiner-haproxy build-conteiner-phpldapadmin build-conteiner-dbadminer

#*****************************************************
#*******PUBLISH CONTAINERS TARGETS********************
Expand Down Expand Up @@ -483,6 +501,10 @@ publish-container-app-ci: ## publicar imagem app-ci
@make IMAGEMTMP=app-ci IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) publish-container-generic


publish-container-app-ci-agendador: ## publicar imagem app-ci-agendador
@make IMAGEMTMP=app-ci-agendador IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) publish-container-generic


publish-container-phpmemcachedadmin-base: ## publicar imagem phpmemcachedadmin-base
@make IMAGEMTMP=phpmemcachedadmin-base IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) publish-container-generic

Expand Down Expand Up @@ -516,4 +538,4 @@ publish-container-dbadminer: ## publicar imagem dbadminer


## publish-containers: executa todos os targets de publicacao de imagem na sequencia
publish-containers: publish-container-base-centos publish-container-memcached publish-container-jod publish-container-mailcatcher publish-container-base-mariadb publish-container-mariadb publish-container-base-sqlserver publish-container-sqlserver publish-container-base-oracle publish-container-oracle publish-container-solr publish-container-base-app publish-container-app-dev publish-container-app-ci publish-container-phpmemcachedadmin-base publish-container-phpmemcachedadmin publish-container-openldap-base publish-container-openldap publish-container-haproxy-base publish-container-haproxy publish-container-phpldapadmin publish-container-dbadminer
publish-containers: publish-container-base-centos publish-container-memcached publish-container-jod publish-container-mailcatcher publish-container-base-mariadb publish-container-mariadb publish-container-base-sqlserver publish-container-sqlserver publish-container-base-oracle publish-container-oracle publish-container-solr publish-container-base-app publish-container-app-dev publish-container-app-ci publish-container-app-ci-agendador publish-container-phpmemcachedadmin-base publish-container-phpmemcachedadmin publish-container-openldap-base publish-container-openldap publish-container-haproxy-base publish-container-haproxy publish-container-phpldapadmin publish-container-dbadminer
5 changes: 3 additions & 2 deletions containers/app/app-base/assets/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ if [ "$IMAGEM_APP_PACOTESQLSERVER_PRESENTE" == "true" ]; then
# Instalação dos componentes de conexão do SQL Server
curl https://packages.microsoft.com/config/rhel/7/prod.repo > /etc/yum.repos.d/mssql-release.repo
ACCEPT_EULA=Y yum install -y msodbcsql17
yum install -y libodbc1 unixODBC unixODBC-devel php-mssql php-pdo
pecl install sqlsrv pdo_sqlsrv
yum install -y libtool-ltdl-devel libodbc1 unixODBC unixODBC-devel php-mssql php-pdo
pecl channel-update pecl.php.net
pecl install sqlsrv-5.10.1 pdo_sqlsrv-5.10.1
printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php.d/20-sqlsrv.ini
printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php.d/30-pdo_sqlsrv.ini

Expand Down
15 changes: 15 additions & 0 deletions containers/app/app-ci-agendador/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
################################################################################
# Dockerfile de construcao do container APP com os pacotes basicos
################################################################################

ARG IMAGEM_BASE=supergovbr/app-ci:latest

FROM ${IMAGEM_BASE}

ADD assets /tmp/assets


RUN /tmp/assets/install.sh && \
rm -rf /tmp/assets

ENTRYPOINT /entrypoint-agendador.sh
36 changes: 36 additions & 0 deletions containers/app/app-ci-agendador/assets/conf/mod-pen/supervisor.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[program:monitoramento_tarefas_pen]
command=/usr/bin/php -c /etc/php.ini /opt/sei/scripts/mod-pen/MonitoramentoTarefasPEN.php --monitorar --segundo-plano
directory=/opt/sei/web
user=root
numprocs=1
autostart=true
autorestart=true
startsecs=5
startretries=10000000
log_stdout=true
log_stderr=true
logfile_maxbytes=0
logfile_backups=50
logfile=/proc/1/fd/1
stdout_logfile=/proc/1/fd/1
stderr_logfile=/proc/1/fd/2
stderr_events_enabled=true

[program:processamento_tarefas_pen]
command=/usr/bin/php -c /etc/php.ini /opt/sei/scripts/mod-pen/ProcessamentoTarefasPEN.php --worker=%(process_num)02d
directory=/opt/sei/web
process_name=%(program_name)s_%(process_num)02d
numprocs=4
user=root
autostart=true
autorestart=true
startsecs=5
startretries=10000000
log_stdout=true
log_stderr=true
logfile_backups=0
logfile_maxbytes=10MB
logfile=/proc/1/fd/1
stdout_logfile=/proc/1/fd/1
stderr_logfile=/proc/1/fd/2
stderr_events_enabled=true
171 changes: 171 additions & 0 deletions containers/app/app-ci-agendador/assets/conf/supervisord.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
; Sample supervisor config file.
;
; For more information on the config file, please see:
; http://supervisord.org/configuration.html
;
; Notes:
; - Shell expansion ("~" or "$HOME") is not supported. Environment
; variables can be expanded using this syntax: "%(ENV_HOME)s".
; - Quotes around values are not supported, except in the case of
; the environment= options as shown below.
; - Comments must have a leading space: "a=b ;comment" not "a=b;comment".
; - Command will be truncated if it looks like a config file comment, e.g.
; "command=bash -c 'foo ; bar'" will truncate to "command=bash -c 'foo ".
;
; Warning:
; Paths throughout this example file use /tmp because it is available on most
; systems. You will likely need to change these to locations more appropriate
; for your system. Some systems periodically delete older files in /tmp.
; Notably, if the socket file defined in the [unix_http_server] section below
; is deleted, supervisorctl will be unable to connect to supervisord.

[unix_http_server]
file=/tmp/supervisor.sock ; the path to the socket file
;chmod=0700 ; socket file mode (default 0700)
;chown=nobody:nogroup ; socket file uid:gid owner
;username=user ; default is no username (open server)
;password=123 ; default is no password (open server)

; Security Warning:
; The inet HTTP server is not enabled by default. The inet HTTP server is
; enabled by uncommenting the [inet_http_server] section below. The inet
; HTTP server is intended for use within a trusted environment only. It
; should only be bound to localhost or only accessible from within an
; isolated, trusted network. The inet HTTP server does not support any
; form of encryption. The inet HTTP server does not use authentication
; by default (see the username= and password= options to add authentication).
; Never expose the inet HTTP server to the public internet.

;[inet_http_server] ; inet (TCP) server disabled by default
;port=127.0.0.1:9001 ; ip_address:port specifier, *:port for all iface
;username=user ; default is no username (open server)
;password=123 ; default is no password (open server)

[supervisord]
logfile=/proc/1/fd/1 ; main log file; default $CWD/supervisord.log
logfile_maxbytes=0 ; max main logfile bytes b4 rotation; default 50MB
logfile_backups=10 ; # of main logfile backups; 0 means none, default 10
loglevel=info ; log level; default info; others: debug,warn,trace
pidfile=/tmp/supervisord.pid ; supervisord pidfile; default supervisord.pid
nodaemon=false ; start in foreground if true; default false
silent=false ; no logs to stdout if true; default false
minfds=1024 ; min. avail startup file descriptors; default 1024
minprocs=200 ; min. avail process descriptors;default 200
;umask=022 ; process file creation umask; default 022
;user=supervisord ; setuid to this UNIX account at startup; recommended if root
;identifier=supervisor ; supervisord identifier, default is 'supervisor'
;directory=/tmp ; default is not to cd during start
;nocleanup=true ; don't clean up tempfiles at start; default false
;childlogdir=/tmp ; 'AUTO' child log dir, default $TEMP
;environment=KEY="value" ; key value pairs to add to environment
;strip_ansi=false ; strip ansi escape codes in logs; def. false

; The rpcinterface:supervisor section must remain in the config file for
; RPC (supervisorctl/web interface) to work. Additional interfaces may be
; added by defining them in separate [rpcinterface:x] sections.

[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

; The supervisorctl section configures how supervisorctl will connect to
; supervisord. configure it match the settings in either the unix_http_server
; or inet_http_server section.

[supervisorctl]
serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket
;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket
;username=chris ; should be same as in [*_http_server] if set
;password=123 ; should be same as in [*_http_server] if set
;prompt=mysupervisor ; cmd line prompt (default "supervisor")
;history_file=~/.sc_history ; use readline history if available

; The sample program section below shows all possible program subsection values.
; Create one or more 'real' program: sections to be able to control them under
; supervisor.

;[program:theprogramname]
;command=/bin/cat ; the program (relative uses PATH, can take args)
;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
;numprocs=1 ; number of processes copies to start (def 1)
;directory=/tmp ; directory to cwd to before exec (def no cwd)
;umask=022 ; umask for process (default None)
;priority=999 ; the relative start priority (default 999)
;autostart=true ; start at supervisord start (default: true)
;startsecs=1 ; # of secs prog must stay up to be running (def. 1)
;startretries=3 ; max # of serial start failures when starting (default 3)
;autorestart=unexpected ; when to restart if exited after running (def: unexpected)
;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0)
;stopsignal=QUIT ; signal used to kill process (default TERM)
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10)
;stopasgroup=false ; send stop signal to the UNIX process group (default false)
;killasgroup=false ; SIGKILL the UNIX process group (def false)
;user=chrism ; setuid to this UNIX account to run the program
;redirect_stderr=true ; redirect proc stderr to stdout (default false)
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
;stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10)
;stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0)
;stdout_events_enabled=false ; emit events on stdout writes (default false)
;stdout_syslog=false ; send stdout to syslog with process name (default false)
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10)
;stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0)
;stderr_events_enabled=false ; emit events on stderr writes (default false)
;stderr_syslog=false ; send stderr to syslog with process name (default false)
;environment=A="1",B="2" ; process environment additions (def no adds)
;serverurl=AUTO ; override serverurl computation (childutils)

; The sample eventlistener section below shows all possible eventlistener
; subsection values. Create one or more 'real' eventlistener: sections to be
; able to handle event notifications sent by supervisord.

;[eventlistener:theeventlistenername]
;command=/bin/eventlistener ; the program (relative uses PATH, can take args)
;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
;numprocs=1 ; number of processes copies to start (def 1)
;events=EVENT ; event notif. types to subscribe to (req'd)
;buffer_size=10 ; event buffer queue size (default 10)
;directory=/tmp ; directory to cwd to before exec (def no cwd)
;umask=022 ; umask for process (default None)
;priority=-1 ; the relative start priority (default -1)
;autostart=true ; start at supervisord start (default: true)
;startsecs=1 ; # of secs prog must stay up to be running (def. 1)
;startretries=3 ; max # of serial start failures when starting (default 3)
;autorestart=unexpected ; autorestart if exited after running (def: unexpected)
;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0)
;stopsignal=QUIT ; signal used to kill process (default TERM)
;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10)
;stopasgroup=false ; send stop signal to the UNIX process group (default false)
;killasgroup=false ; SIGKILL the UNIX process group (def false)
;user=chrism ; setuid to this UNIX account to run the program
;redirect_stderr=false ; redirect_stderr=true is not allowed for eventlisteners
;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
;stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10)
;stdout_events_enabled=false ; emit events on stdout writes (default false)
;stdout_syslog=false ; send stdout to syslog with process name (default false)
;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10)
;stderr_events_enabled=false ; emit events on stderr writes (default false)
;stderr_syslog=false ; send stderr to syslog with process name (default false)
;environment=A="1",B="2" ; process environment additions
;serverurl=AUTO ; override serverurl computation (childutils)

; The sample group section below shows all possible group values. Create one
; or more 'real' group: sections to create "heterogeneous" process groups.

;[group:thegroupname]
;programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions
;priority=999 ; the relative start priority (default 999)

; The [include] section can just contain the "files" setting. This
; setting can list multiple files (separated by whitespace or
; newlines). It can also contain wildcards. The filenames are
; interpreted as relative to this file. Included files *cannot*
; include files themselves.

[include]
files=/etc/supervisor/supervisor.ini
;files = relative/directory/*.ini
Loading

0 comments on commit 59aa201

Please sign in to comment.