diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-15 15:58:03 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-17 01:55:48 -0400 |
| commit | cc64d0175a3c2c974709e9962c00fbe04d74c43f (patch) | |
| tree | b03dc9591925761c583a8b14c101c1052f1ace0d /Makefile.am | |
| parent | fdfccdbc985944a57017a25f44dd6acc1a937bab (diff) | |
journal-remote: HTTP(s) support
The whole tool is made dependent on µhttpd availability. It should be
easy to make the µhttpd parts conditional, but since transfer over
HTTP seems to be the primary use case, currently this is not done.
Current implementation uses nested epoll loops: sd-event is used for
the external event loop, and µhttpd uses epoll in its own
loop. Unfortunately µhttpd does not expose enough information to add
the descriptors it uses to the external event loop. This means that
starvation of other events is possible, if one of the inner µhttpd
loops is constantly busy. This means that µhttpd servers should not
be mixed with other sources.
The TLS authentication parts haven't been really tested properly, and
should not be take too seriously.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 923e3c4720..4f94587f7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3130,6 +3130,10 @@ systemd_cat_SOURCES = \ systemd_cat_LDADD = \ libsystemd-journal-core.la +if HAVE_MICROHTTPD +rootlibexec_PROGRAMS += \ + systemd-journal-remote + systemd_journal_remote_SOURCES = \ src/journal/journal-remote-parse.h \ src/journal/journal-remote-parse.c \ @@ -3141,6 +3145,23 @@ systemd_journal_remote_LDADD = \ libsystemd-internal.la \ libsystemd-journal-core.la +systemd_journal_remote_SOURCES += \ + src/journal/microhttpd-util.h \ + src/journal/microhttpd-util.c + +systemd_journal_remote_CFLAGS = \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +systemd_journal_remote_LDADD += \ + $(MICROHTTPD_LIBS) + +if HAVE_GNUTLS +systemd_journal_remote_LDADD += \ + $(GNUTLS_LIBS) +endif +endif + # using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ $(AM_CFLAGS) @@ -3391,8 +3412,7 @@ noinst_LTLIBRARIES += \ libsystemd-journal-internal.la rootlibexec_PROGRAMS += \ - systemd-journald \ - systemd-journal-remote + systemd-journald rootbin_PROGRAMS += \ journalctl |