Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

syslog-ng: 3.6.2 -> 3.9.1 #22752

Merged
merged 4 commits into from Feb 15, 2017
Merged

syslog-ng: 3.6.2 -> 3.9.1 #22752

merged 4 commits into from Feb 15, 2017

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Feb 13, 2017 •
edited

@fpletz this fixes #20153.

Since syslog-ng is currently broken on 16.09 this should be cherry-picked on release-16.09.

I tested it with the following configuration:

{
  services.syslog-ng = {
    enable = true;
    extraConfig = ''
      source s_network_tcp {
        network (
          ip("0.0.0.0")
          port(601)
          transport("tcp")
        );
      };
     
      destination d_devlog {
        unix-dgram(
          /dev/log
          flags(syslog-protocol)
        );
      };
     
      log {
        source(s_network_tcp);
        destination(d_devlog);
      };
    '';
  };
}

If I then log a message using:

logger --server=localhost --tcp "Hello World"

I see the following in my journalctl:

Feb 13 18:07:15 bas.van.dijk.lumi syslog-ng[13387]: 1 2017-02-13T18:07:15+01:00 localhost 1 - - - 2017-02-13T18:07:15.046465+01:00 bas.van.dijk.lumi bas.van.dijk - - [timeQuality tzKnown="1" isSynced="1" syncAccuracy="229387"] Hello World

@mention-bot
Copy link

@basvandijk, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rickynils, @peti and @avnik to be potential reviewers.

@grahamc
Copy link
Member

grahamc commented Feb 13, 2017

In what way is syslog-ng broken on 16.09?

@basvandijk
Copy link
Member Author

@grahamc see #20153.

abbradar
abbradar reviewed Feb 14, 2017
View reviewed changes
pkgs/tools/system/syslog-ng/default.nix Outdated
stdenv.mkDerivation rec {
name = "syslog-ng-${version}";
stdenv.mkDerivation {
name = "syslog-ng-3.9.1";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please leave version. It was discussed (admittedly a long time ago and it'd be difficult to find) that we might move to using it insttead of parsing name some day; it'd definitely be easier to move if most packages already contain it. Disclosure: I want it to happen very much as current way seems ugly to me ^_^

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, no problem.

@fpletz fpletz added this to the 17.03 milestone Feb 14, 2017
@fpletz fpletz self-assigned this Feb 14, 2017
@fpletz
syslog-ng: refactor
e38f7c6
@fpletz
syslogng_incubator: 141106 -> 0.5.0, mark as broken
ea309fc 
This is the current release but neither this nor the current master
is compatible with syslog-ng 3.8+. Committed work on update and
refactor of expression to make it easier in the future to bump.
@fpletz
libivykis: 0.40 -> 0.41
bf565a4
@basvandijk
Copy link
Member Author

@fpletz thanks for the refactoring. It looks good!

Since I'm now using a local override of syslog-ng I don't care that much anymore if this gets cherry-picked on 16.09. Waiting on 17.03 is fine by me.

@fpletz fpletz merged commit eda8ee2 into NixOS:master Feb 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abbradar abbradar abbradar left review comments

Assignees

@fpletz fpletz

Labels
8.has: package (update)
Projects
None yet
Milestone
17.03
Development

Successfully merging this pull request may close these issues.

systemd syslog-ng service fails to activate
5 participants
@basvandijk @mention-bot @grahamc @abbradar @fpletz