[systemd-devel] [PATCH v2] Support for building journal-remote without microhttpd

[Zbigniew Jędrzejewski-Szmek]

On Thu, Jun 12, 2014 at 11:04:44PM -0500, Charles Duffy wrote:
> On Thu, Jun 12, 2014 at 10:40 PM, Charles Duffy <charles at dyfis.net> wrote:
> 
> > Howdy --
> >
> > It seems a bit unfortunate to have the only way to deserialize content in
> > journald's official serialization/export format depend on a HTTP server
> > library. A patch which allows journal-remote to build without microhttpd is
> > available at
> > https://github.com/threatgrid/systemd/compare/journal_remote_without_microhttpd?expand=1,
> > or attached.
> >
> > Feedback very much appreciated.
> >
> 
> First rev at this patch had some cruft left over from a partial refactoring
> based on a misreading/misunderstanding of some code. (If y'all don't see
> it, I'll presume that a list admin had mercy and removed the message from
> the queue).
Hi,

I now pushed my journal-remote patches along with the journal-upload code.
I think your patch is useful, but its quite intrusive. Could you remake
it on top of current git, but instead of wrapping every individual function
in ifdefs, move the µhttpd-related functions to a new source file
journal-remote-µhttpd.c or something like that, and also leave around
the arg_key/arg_cert/arg_trust arguments, even when compiling without µhttpd.
This way the checks like 'if (arg_listen_https && !(key_pem && cert_pem))'
don't have to be wrapped in ifdefs, they will just become noops.

Thanks,
Zbyszek