storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Tweak log levels for some messages.

Browse Source
This commit is contained in:
Justin Maggard 2012-02-25 01:10:23 +00:00
parent aea5da4107
commit 638c4a45d9
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
minidlna.c
View File

@ -384,7 +384,7 @@ init(int argc, char * * argv)
{ {
/* only error if file exists or using -f */ /* only error if file exists or using -f */
if(access(optionsfile, F_OK) == 0 || options_flag) if(access(optionsfile, F_OK) == 0 || options_flag)
DPRINTF(E_ERROR, L_GENERAL, "Error reading configuration file %s\n", optionsfile); DPRINTF(E_FATAL, L_GENERAL, "Error reading configuration file %s\n", optionsfile);
} }
else else
{ {
@ -609,7 +609,7 @@ init(int argc, char * * argv)
{ {
if(argv[i][0]!='-') if(argv[i][0]!='-')
{ {
DPRINTF(E_ERROR, L_GENERAL, "Unknown option: %s\n", argv[i]); DPRINTF(E_FATAL, L_GENERAL, "Unknown option: %s\n", argv[i]);
} }
else if(strcmp(argv[i], "--help")==0) else if(strcmp(argv[i], "--help")==0)
{ {
@ -622,25 +622,25 @@ init(int argc, char * * argv)
if(i+1 < argc) if(i+1 < argc)
runtime_vars.notify_interval = atoi(argv[++i]); runtime_vars.notify_interval = atoi(argv[++i]);
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 's': case 's':
if(i+1 < argc) if(i+1 < argc)
strncpyt(serialnumber, argv[++i], SERIALNUMBER_MAX_LEN); strncpyt(serialnumber, argv[++i], SERIALNUMBER_MAX_LEN);
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 'm': case 'm':
if(i+1 < argc) if(i+1 < argc)
strncpyt(modelnumber, argv[++i], MODELNUMBER_MAX_LEN); strncpyt(modelnumber, argv[++i], MODELNUMBER_MAX_LEN);
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 'p': case 'p':
if(i+1 < argc) if(i+1 < argc)
runtime_vars.port = atoi(argv[++i]); runtime_vars.port = atoi(argv[++i]);
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 'P': case 'P':
if(i+1 < argc) if(i+1 < argc)
@ -651,7 +651,7 @@ init(int argc, char * * argv)
pidfilename = argv[i]; pidfilename = argv[i];
} }
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 'd': case 'd':
debug_flag = 1; debug_flag = 1;
@ -665,7 +665,7 @@ init(int argc, char * * argv)
if(i+1 < argc) if(i+1 < argc)
presurl = argv[++i]; presurl = argv[++i];
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 'a': case 'a':
if(i+1 < argc) if(i+1 < argc)
@ -694,7 +694,7 @@ init(int argc, char * * argv)
} }
} }
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 'i': case 'i':
if(i+1 < argc) if(i+1 < argc)
@ -728,7 +728,7 @@ init(int argc, char * * argv)
} }
} }
else else
DPRINTF(E_ERROR, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]); DPRINTF(E_FATAL, L_GENERAL, "Option -%c takes one argument.\n", argv[i][1]);
break; break;
case 'f': case 'f':
i++; /* discarding, the config file is already read */ i++; /* discarding, the config file is already read */
@ -739,7 +739,7 @@ init(int argc, char * * argv)
case 'R': case 'R':
snprintf(buf, sizeof(buf), "rm -rf %s/files.db %s/art_cache", db_path, db_path); snprintf(buf, sizeof(buf), "rm -rf %s/files.db %s/art_cache", db_path, db_path);
if( system(buf) != 0 ) if( system(buf) != 0 )
DPRINTF(E_WARN, L_GENERAL, "Failed to clean old file cache.\n"); DPRINTF(E_FATAL, L_GENERAL, "Failed to clean old file cache. EXITING\n");
break; break;
case 'V': case 'V':
printf("Version " MINIDLNA_VERSION "\n"); printf("Version " MINIDLNA_VERSION "\n");
@ -924,7 +924,7 @@ main(int argc, char * * argv)
cmd = NULL; cmd = NULL;
if( i != 0 ) if( i != 0 )
{ {
DPRINTF(E_WARN, L_GENERAL, "Failed to clean old file cache.\n"); DPRINTF(E_FATAL, L_GENERAL, "Failed to clean old file cache! Exiting...\n");
} }
free(cmd); free(cmd);
open_db(); open_db();
@ -969,7 +969,7 @@ main(int argc, char * * argv)
if( sqlite3_threadsafe() && sqlite3_libversion_number() >= 3005001 && if( sqlite3_threadsafe() && sqlite3_libversion_number() >= 3005001 &&
GETFLAG(INOTIFY_MASK) && pthread_create(&inotify_thread, NULL, start_inotify, NULL) ) GETFLAG(INOTIFY_MASK) && pthread_create(&inotify_thread, NULL, start_inotify, NULL) )
{ {
DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for start_inotify.\n"); DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for start_inotify. EXITING\n");
} }
#endif #endif
sudp = OpenAndConfSSDPReceiveSocket(n_lan_addr, lan_addr); sudp = OpenAndConfSSDPReceiveSocket(n_lan_addr, lan_addr);