mirror of
https://github.com/lxsang/antd-tunnel-publishers
synced 2024-12-25 01:28:21 +01:00
add runner service manager
This commit is contained in:
parent
06fd912228
commit
f0ec25e00a
15
Makefile.am
15
Makefile.am
@ -1,3 +1,18 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
AM_CPPFLAGS = -W -Wall -g -std=c99
|
||||
|
||||
# bin
|
||||
bin_PROGRAMS = runner
|
||||
# source files
|
||||
runner_SOURCES = runner.c
|
||||
|
||||
#sysconf_DATA = runner.ini
|
||||
install-data-local:
|
||||
- cp runner.ini $(prefix)/
|
||||
- cp runnerd $(prefix)/bin
|
||||
- [ -d /etc/systemd/system/ ] && cp antd-tunnel-publisher.service /etc/systemd/system/
|
||||
|
||||
EXTRA_DIST = runner.ini runnerd tunnel.h antd-tunnel-publisher.service log.h
|
||||
|
||||
SUBDIRS = . vterm
|
12
antd-tunnel-publisher.service
Normal file
12
antd-tunnel-publisher.service
Normal file
@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Antd Publisher Service
|
||||
After=antd.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=root
|
||||
WorkingDirectory=/opt/www
|
||||
ExecStart=/opt/www/bin/runnerd
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
BIN
dist/antd-publishers-0.1.0a.tar.gz
vendored
Normal file
BIN
dist/antd-publishers-0.1.0a.tar.gz
vendored
Normal file
Binary file not shown.
134
runner.c
Normal file
134
runner.c
Normal file
@ -0,0 +1,134 @@
|
||||
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <antd/list.h>
|
||||
#include <antd/ini.h>
|
||||
#include "log.h"
|
||||
|
||||
#define MODULE_NAME "runner"
|
||||
|
||||
static volatile int running = 1;
|
||||
static list_t pids;
|
||||
static char socket_file[BUFFLEN];
|
||||
static void int_handler(int dummy) {
|
||||
(void) dummy;
|
||||
running = 0;
|
||||
}
|
||||
|
||||
static int ini_handle(void *user_data, const char *section, const char *name,
|
||||
const char *value)
|
||||
{
|
||||
pid_t pid;
|
||||
char* argv[3];
|
||||
UNUSED(user_data);
|
||||
if (EQU(section, "RUNNER"))
|
||||
{
|
||||
if(EQU(name, "socket"))
|
||||
{
|
||||
M_LOG(MODULE_NAME, "Configuration file is %s", value);
|
||||
(void)strncpy(socket_file,value,BUFFLEN);
|
||||
}
|
||||
else if(EQU(name, "service"))
|
||||
{
|
||||
M_LOG(MODULE_NAME, "Running service %s...", value);
|
||||
pid = fork();
|
||||
if(pid == -1)
|
||||
{
|
||||
M_ERROR(MODULE_NAME, "Unable to fork: %s", strerror(errno));
|
||||
return 0;
|
||||
}
|
||||
if(pid == 0)
|
||||
{
|
||||
// child
|
||||
argv[0] = (char*)value;
|
||||
argv[1] = (char*)socket_file;
|
||||
argv[2] = NULL;
|
||||
execve(argv[0], &argv[0], NULL);
|
||||
// Nothing below this line should be executed by child process. If so,
|
||||
// it means that the execl function wasn't successfull, so lets exit:
|
||||
_exit(1);
|
||||
}
|
||||
// parent
|
||||
list_put_i(&pids, pid);
|
||||
}
|
||||
else
|
||||
{
|
||||
M_ERROR(MODULE_NAME, "Ignore unknown configuration %s = %s", name, value);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int main(int argc, char const *argv[])
|
||||
{
|
||||
const char* conf_file;
|
||||
item_t item;
|
||||
pid_t w_pid;
|
||||
int pid_count;
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
signal(SIGABRT, SIG_IGN);
|
||||
signal(SIGINT, int_handler);
|
||||
if(argc != 2)
|
||||
{
|
||||
printf("Usage: %s /path/to/conf.ini", argv[0]);
|
||||
return -1;
|
||||
}
|
||||
conf_file = argv[1];
|
||||
|
||||
pids = list_init();
|
||||
|
||||
if (ini_parse(conf_file, ini_handle, NULL) < 0)
|
||||
{
|
||||
M_ERROR(MODULE_NAME, "Can't load '%s'", conf_file);
|
||||
return -1;
|
||||
}
|
||||
pid_count = list_size(pids);
|
||||
// monitoring the process
|
||||
while(running != 0 && pid_count != 0)
|
||||
{
|
||||
pid_count = 0;
|
||||
list_for_each(item, pids)
|
||||
{
|
||||
w_pid = waitpid((pid_t) item->value.i, NULL, WNOHANG);
|
||||
if(w_pid == -1 || w_pid > 0)
|
||||
{
|
||||
// child exits
|
||||
M_LOG(MODULE_NAME, "Process %d exits\n", item->value.i);
|
||||
item->value.i = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
pid_count++;
|
||||
}
|
||||
}
|
||||
// 500 ms
|
||||
usleep(500000);
|
||||
}
|
||||
// kill all the remaining processes
|
||||
list_for_each(item, pids)
|
||||
{
|
||||
if(item->value.i != -1)
|
||||
{
|
||||
if(kill(item->value.i, SIGKILL) == - 1)
|
||||
{
|
||||
M_ERROR(MODULE_NAME, "Unable to kill process %d: %s", item->value.i, strerror(errno));
|
||||
}
|
||||
else
|
||||
{
|
||||
(void)waitpid(item->value.i, NULL, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
list_free(&pids);
|
||||
return 0;
|
||||
}
|
3
runner.ini
Normal file
3
runner.ini
Normal file
@ -0,0 +1,3 @@
|
||||
[RUNNER]
|
||||
socket=/opt/www/tmp/channels/antd_hotline.sock
|
||||
service=/opt/www/bin/vterm
|
2
runnerd
Executable file
2
runnerd
Executable file
@ -0,0 +1,2 @@
|
||||
#! /bin/bash
|
||||
/opt/www/bin/runner /opt/www/runner.ini
|
BIN
vterm/vterm
BIN
vterm/vterm
Binary file not shown.
@ -14,7 +14,7 @@
|
||||
#include <antd/list.h>
|
||||
#include <antd/bst.h>
|
||||
|
||||
#include "tunnel.h"
|
||||
#include "../tunnel.h"
|
||||
|
||||
#define MODULE_NAME "vterm"
|
||||
|
||||
@ -319,6 +319,8 @@ int main(int argc, char** argv)
|
||||
printf("Usage: %s path/to/hotline/socket\n", argv[0]);
|
||||
return -1;
|
||||
}
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
signal(SIGABRT, SIG_IGN);
|
||||
signal(SIGINT, int_handler);
|
||||
M_LOG(MODULE_NAME, "Hotline is: %s", argv[1]);
|
||||
// now try to request new channel from hotline
|
||||
|
Loading…
Reference in New Issue
Block a user