ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/slog.C
(Generate patch)

Comparing gvpe/src/slog.C (file contents):
Revision 1.3 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.8 by root, Fri Apr 24 21:55:29 2015 UTC

1/* 1/*
2 slog.C -- logging 2 slog.C -- logging
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
18*/ 30*/
19 31
20#include <cstdarg> 32#include <cstdarg>
21#include <cstdio> 33#include <cstdio>
22#include <cstring> 34#include <cstring>
29 41
30loglevel log_level = L_INFO; 42loglevel log_level = L_INFO;
31const char *log_identity = ""; 43const char *log_identity = "";
32static int logto = LOGTO_STDERR; 44static int logto = LOGTO_STDERR;
33 45
46loglevel
34loglevel string_to_loglevel (const char *s) 47string_to_loglevel (const char *s)
35{ 48{
36 if (!strcmp (s, "noise")) return L_NOISE; 49 if (!strcmp (s, "noise")) return L_NOISE;
37 if (!strcmp (s, "trace")) return L_TRACE; 50 if (!strcmp (s, "trace")) return L_TRACE;
38 if (!strcmp (s, "debug")) return L_DEBUG; 51 if (!strcmp (s, "debug")) return L_DEBUG;
39 if (!strcmp (s, "info")) return L_INFO; 52 if (!strcmp (s, "info")) return L_INFO;
43 if (!strcmp (s, "critical")) return L_CRIT; 56 if (!strcmp (s, "critical")) return L_CRIT;
44 57
45 return L_NONE; 58 return L_NONE;
46} 59}
47 60
61void
48void log_to (int mask) 62log_to (int mask)
49{ 63{
50 if (logto & LOGTO_SYSLOG) 64 if (logto & LOGTO_SYSLOG)
51 closelog (); 65 closelog ();
52 66
53 logto = mask; 67 logto = mask;
54 68
55 if (logto & LOGTO_SYSLOG) 69 if (logto & LOGTO_SYSLOG)
56 openlog (log_identity, LOG_CONS | LOG_PID, LOG_DAEMON); 70 openlog (log_identity, LOG_CONS | LOG_PID, LOG_DAEMON);
57} 71}
58 72
73void
59void slog_ (const loglevel l, const char *m, ...) 74slog_ (const loglevel l, const char *m, ...)
60{ 75{
61 if (l >= log_level) 76 if (l >= log_level)
62 { 77 {
63 va_list ap; 78 va_list ap;
64 va_start (ap, m); 79 va_start (ap, m);
83 { 98 {
84 write (2, msg, strlen (msg)); 99 write (2, msg, strlen (msg));
85 write (2, "\n", 1); 100 write (2, "\n", 1);
86 } 101 }
87 102
88 delete msg; 103 delete [] msg;
89 } 104 }
90} 105}
91 106
107void
92void fatal (const char *m) 108fatal (const char *m)
93{ 109{
94 slog (L_CRIT, m); 110 slog (L_CRIT, m);
95 exit (EXIT_FAILURE); 111 exit (EXIT_FAILURE);
96} 112}
97 113
114void
98extern void require_failed (const char *file, int line, const char *info) 115require_failed (const char *file, int line, const char *info)
99{ 116{
100 slog (L_CRIT, "FATAL: This program encountered a SHOULD NOT HAPPEN condition and will exit:"); 117 slog (L_CRIT, "FATAL: This program encountered a SHOULD NOT HAPPEN condition and will exit:");
101 slog (L_CRIT, "FATAL+ %s:%d '%s' is false", file, line, info); 118 slog (L_CRIT, "FATAL+ %s:%d '%s' is false", file, line, info);
102 slog (L_CRIT, "FATAL+ This might indicates a bug in this program, a bug in your libraries,"); 119 slog (L_CRIT, "FATAL+ This might indicates a bug in this program, a bug in your libraries,");
103 slog (L_CRIT, "FATAL+ your system setup or operating system. Or it might indicate a very"); 120 slog (L_CRIT, "FATAL+ your system setup or operating system. Or it might indicate a very");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines