From patchwork Fri Mar 10 20:04:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaarle Ritvanen X-Patchwork-Id: 737562 X-Patchwork-Delegate: regit@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vfysQ2wGnz9s86 for ; Sat, 11 Mar 2017 07:04:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932672AbdCJUEl (ORCPT ); Fri, 10 Mar 2017 15:04:41 -0500 Received: from welho-filter1.welho.com ([83.102.41.23]:48590 "EHLO welho-filter1.welho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755480AbdCJUEk (ORCPT ); Fri, 10 Mar 2017 15:04:40 -0500 Received: from localhost (localhost [127.0.0.1]) by welho-filter1.welho.com (Postfix) with ESMTP id 10E561EEE4; Fri, 10 Mar 2017 22:04:37 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from welho-smtp2.welho.com ([IPv6:::ffff:83.102.41.85]) by localhost (welho-filter1.welho.com [::ffff:83.102.41.23]) (amavisd-new, port 10024) with ESMTP id 7Powqh68GGP7; Fri, 10 Mar 2017 22:04:36 +0200 (EET) Received: from kanala.kunkku.net (178-75-143-108.bb.dnainternet.fi [178.75.143.108]) by welho-smtp2.welho.com (Postfix) with ESMTP id 72E5B21C; Fri, 10 Mar 2017 22:04:36 +0200 (EET) Received: from kanala.kunkku.net (kanala.kunkku.net [127.0.0.1]) by kanala.kunkku.net (8.15.2/8.15.2) with ESMTP id v2AK4YA7015589; Fri, 10 Mar 2017 22:04:34 +0200 Received: (from kaarle@localhost) by kanala.kunkku.net (8.15.2/8.15.2/Submit) id v2AK4VCK015588; Fri, 10 Mar 2017 22:04:31 +0200 X-Authentication-Warning: kanala.kunkku.net: kaarle set sender to kaarle.ritvanen@datakunkku.fi using -f From: Kaarle Ritvanen To: netfilter-devel@vger.kernel.org Cc: Kaarle Ritvanen Subject: [PATCH 1/2] harmonize log file defaults with ulogd.conf Date: Fri, 10 Mar 2017 22:04:25 +0200 Message-Id: <20170310200426.15543-1-kaarle.ritvanen@datakunkku.fi> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org --- doc/ulogd.sgml | 4 ++-- output/ulogd_output_GPRINT.c | 2 +- output/ulogd_output_LOGEMU.c | 2 +- output/ulogd_output_NACCT.c | 2 +- output/ulogd_output_OPRINT.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/ulogd.sgml b/doc/ulogd.sgml index 65a63cf..de799f4 100644 --- a/doc/ulogd.sgml +++ b/doc/ulogd.sgml @@ -422,7 +422,7 @@ to a file. The only useful application is debugging. dumpfile The filename where it should log to. The default is -/var/log/ulogd.pktlog +/var/log/ulogd_oprint.log ulogd_output_LOGEMU.so @@ -433,7 +433,7 @@ as possible. Logging is done to a seperate textfile instead of syslog, though. The module defines the following configuration directives: fileThe filename where it should log to. The default is -/var/log/ulogd.syslogemu +/var/log/ulogd_syslogemu.log syncSet this to 1 if you want to have your logfile written synchronously. This may reduce performance, but makes your log-lines appear immediately. The default is 0 diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c index 4f49c34..bc7aa34 100644 --- a/output/ulogd_output_GPRINT.c +++ b/output/ulogd_output_GPRINT.c @@ -31,7 +31,7 @@ #include #ifndef ULOGD_GPRINT_DEFAULT -#define ULOGD_GPRINT_DEFAULT "/var/log/ulogd.gprint" +#define ULOGD_GPRINT_DEFAULT "/var/log/ulogd_gprint.log" #endif struct gprint_priv { diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c index bb27209..cfcfab7 100644 --- a/output/ulogd_output_LOGEMU.c +++ b/output/ulogd_output_LOGEMU.c @@ -37,7 +37,7 @@ #endif #ifndef ULOGD_LOGEMU_DEFAULT -#define ULOGD_LOGEMU_DEFAULT "/var/log/ulogd.syslogemu" +#define ULOGD_LOGEMU_DEFAULT "/var/log/ulogd_syslogemu.log" #endif #ifndef ULOGD_LOGEMU_SYNC_DEFAULT diff --git a/output/ulogd_output_NACCT.c b/output/ulogd_output_NACCT.c index 9de8a73..d369c7a 100644 --- a/output/ulogd_output_NACCT.c +++ b/output/ulogd_output_NACCT.c @@ -29,7 +29,7 @@ #include #include -#define NACCT_FILE_DEFAULT "/var/log/nacctdata.log" +#define NACCT_FILE_DEFAULT "/var/log/ulogd_nacct.log" /* config accessors (lazy me...) */ #define NACCT_CFG_FILE(pi) ((pi)->config_kset->ces[0].u.string) diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c index e390c84..6fde445 100644 --- a/output/ulogd_output_OPRINT.c +++ b/output/ulogd_output_OPRINT.c @@ -28,7 +28,7 @@ #include #ifndef ULOGD_OPRINT_DEFAULT -#define ULOGD_OPRINT_DEFAULT "/var/log/ulogd.pktlog" +#define ULOGD_OPRINT_DEFAULT "/var/log/ulogd_oprint.log" #endif #define NIPQUAD(addr) \