diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-01-08 11:29:13 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-01-08 11:29:13 +0200 |
commit | 3325fed2895f079486b88c65409c73153fec306f (patch) | |
tree | 65165fde1e48346892cd0c0dfd7f7a4980ba1665 /src/pies.h | |
parent | 46b2745b25176c14c42bcc9612b290c310929aa0 (diff) | |
download | pies-3325fed2895f079486b88c65409c73153fec306f.tar.gz pies-3325fed2895f079486b88c65409c73153fec306f.tar.bz2 |
Enable control socket when run as init process.
* configure.ac (DEFAULT_CONTROL_URL): Rename to
DEFAULT_PIES_CONTROL_URL. Change default value.
(DEFAULT_INIT_CONTROL_URL): New subst variable.
* lib/libpies.h (pies_basic_url_create): New prototype.
* lib/url.c (pies_basic_url_create): New function (renamed
from pies_url_create).
(pies_url_create): Expand variable references in the input string.
* src/Makefile.am (AM_CPPFLAGS): Pass DEFAULT_INIT_CONTROL_URL
* src/ctl.c (pies_control_url)
(ctl_open): Don't exit on errors, return -1 instead.
* src/pies.c (default_control_url): New variable.
(config_parse): Create default socket url.
(pies_control_url): New macro
(main): Set environment variable PIES_INSTANCE.
Try to open control socket in init process mode as well.
* src/pies.h (default_control_url): New extern.
(ctl_open): Change prototype.
(pies_control_url): Remove.
* src/piesctl-cl.opt (parse_options): Set environment variable
PIES_INSTANCE.
* src/piesctl.c (parse_config): Use pies_url_create and
DEFAULT_PIES_CONTROL_URL when falling back to the default socket.
Diffstat (limited to 'src/pies.h')
-rw-r--r-- | src/pies.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -292,6 +292,7 @@ extern int dfl_level; | |||
292 | 292 | ||
293 | extern size_t pies_master_argc; | 293 | extern size_t pies_master_argc; |
294 | extern char **pies_master_argv; | 294 | extern char **pies_master_argv; |
295 | extern char *default_control_url[2]; | ||
295 | 296 | ||
296 | enum config_syntax | 297 | enum config_syntax |
297 | { | 298 | { |
@@ -549,5 +550,4 @@ struct control | |||
549 | 550 | ||
550 | extern struct control control; | 551 | extern struct control control; |
551 | 552 | ||
552 | void ctl_open(void); | 553 | int ctl_open(void); |
553 | char const *pies_control_url (void); | ||