Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UCC
OpenDispense2
Commits
73c92939
Commit
73c92939
authored
Apr 16, 2015
by
John Hodge
Browse files
Server - Fix inverted logic in enabling/disabling syslog
parent
0a03be34
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/server/common.h
View file @
73c92939
...
...
@@ -73,6 +73,8 @@ extern int giNumHandlers;
extern
int
giDebugLevel
;
extern
bool
gbNoCostMode
;
extern
bool
gbSyslogDisabled
;
// === FUNCTIONS ===
extern
void
Items_UpdateFile
(
void
);
...
...
src/server/logging.c
View file @
73c92939
...
...
@@ -11,24 +11,24 @@
#include <syslog.h>
// === GLOBALS ===
bool
gbSyslog
En
abled
=
true
;
bool
gbSyslog
Dis
abled
=
true
;
// === CODE ==
void
Log_Error
(
const
char
*
Format
,
...)
{
va_list
args
;
va_start
(
args
,
Format
);
if
(
gbSyslogEnabled
)
if
(
!
gbSyslogDisabled
)
{
va_start
(
args
,
Format
);
vsyslog
(
LOG_WARNING
,
Format
,
args
);
va_end
(
args
);
}
else
{
fprintf
(
stderr
,
"WARNING: "
);
vfprintf
(
stderr
,
Format
,
args
);
fprintf
(
stderr
,
"
\n
"
);
}
va_start
(
args
,
Format
);
fprintf
(
stderr
,
"WARNING: "
);
vfprintf
(
stderr
,
Format
,
args
);
fprintf
(
stderr
,
"
\n
"
);
va_end
(
args
);
}
...
...
@@ -36,17 +36,16 @@ void Log_Info(const char *Format, ...)
{
va_list
args
;
va_start
(
args
,
Format
);
if
(
gbSyslogEnabled
)
if
(
!
gbSyslogDisabled
)
{
va_start
(
args
,
Format
);
vsyslog
(
LOG_INFO
,
Format
,
args
);
va_end
(
args
);
}
else
{
fprintf
(
stderr
,
"WARNING: "
);
vfprintf
(
stderr
,
Format
,
args
);
fprintf
(
stderr
,
"
\n
"
);
}
va_start
(
args
,
Format
);
fprintf
(
stderr
,
"INFO: "
);
vfprintf
(
stderr
,
Format
,
args
);
fprintf
(
stderr
,
"
\n
"
);
va_end
(
args
);
}
src/server/main.c
View file @
73c92939
...
...
@@ -33,7 +33,6 @@ extern const char *gsItemListFile;
extern
const
char
*
gsCoke_ModbusAddress
;
extern
int
giCoke_ModbusPort
;
extern
const
char
*
gsDoor_SerialPort
;
extern
bool
gbSyslogEnabled
;
// === PROTOTYPES ===
void
*
Periodic_Thread
(
void
*
Unused
);
...
...
@@ -144,7 +143,7 @@ int main(int argc, char *argv[])
OPT_CFG
(
giCoke_ModbusPort
,
Int
,
"coke_modbus_port"
);
OPT_CFG
(
gbNoCostMode
,
Bool
,
"test_mode"
);
OPT_CFG
(
gbSyslog
En
abled
,
Bool
,
"disable_syslog"
);
OPT_CFG
(
gbSyslog
Dis
abled
,
Bool
,
"disable_syslog"
);
if
(
!
rv
)
{
fprintf
(
stderr
,
"ERROR: Some required configuration items were missing
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment