chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2cd33d8
)
activate: print a nice message if no fd to listen on was specified
author
Lennart Poettering
<lennart@poettering.net>
Thu, 7 Nov 2013 15:52:47 +0000
(16:52 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 7 Nov 2013 15:53:26 +0000
(16:53 +0100)
src/activate/activate.c
patch
|
blob
|
history
diff --git
a/src/activate/activate.c
b/src/activate/activate.c
index f0944aac5c846e9339f887b639a4a14109869581..3198f7de988669d31573b28011519de2764cb3e0 100644
(file)
--- a/
src/activate/activate.c
+++ b/
src/activate/activate.c
@@
-127,7
+127,7
@@
static int open_sockets(int *epoll_fd, bool accept) {
_cleanup_free_ char *name = NULL;
getsockname_pretty(fd, &name);
_cleanup_free_ char *name = NULL;
getsockname_pretty(fd, &name);
- log_info("Listening on %s
.", strna(name)
);
+ log_info("Listening on %s
as %i.", strna(name), fd
);
r = add_epoll(*epoll_fd, fd);
if (r < 0)
r = add_epoll(*epoll_fd, fd);
if (r < 0)
@@
-381,6
+381,10
@@
int main(int argc, char **argv, char **envp) {
n = open_sockets(&epoll_fd, arg_accept);
if (n < 0)
return EXIT_FAILURE;
n = open_sockets(&epoll_fd, arg_accept);
if (n < 0)
return EXIT_FAILURE;
+ if (n == 0) {
+ log_error("No sockets to listen on specified or passed in.");
+ return EXIT_FAILURE;
+ }
for (;;) {
struct epoll_event event;
for (;;) {
struct epoll_event event;
@@
-394,7
+398,7
@@
int main(int argc, char **argv, char **envp) {
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- log_info("Communication attempt on fd
:%d
", event.data.fd);
+ log_info("Communication attempt on fd
%i.
", event.data.fd);
if (arg_accept) {
r = do_accept(argv[optind], argv + optind, envp,
event.data.fd);
if (arg_accept) {
r = do_accept(argv[optind], argv + optind, envp,
event.data.fd);