Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2016-08-05 22:19:16 +02:00
parent 30135fc1b9 c5d266ff72
commit 3dab1876ae
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@ -152,7 +152,9 @@ static int verbosity_to_flags(int verbosity) {
static int parse_args(int argc, char **argv, int *exitcode) static int parse_args(int argc, char **argv, int *exitcode)
{ {
int i, log_stderr = 0, log_flags = 0; int i;
int log_stderr = LOG_CPERROR;
int log_flags = LOG_CPERROR | LOG_CPWARNING | LOG_CPINFO;
for (i = 1; i != argc; ++i) { for (i = 1; i != argc; ++i) {
char *argi = argv[i]; char *argi = argv[i];