options.c (goaccess-1.6.5) | : | options.c (goaccess-1.7) | ||
---|---|---|---|---|
skipping to change at line 146 | skipping to change at line 146 | |||
{"persist" , no_argument , 0 , 0 } , | {"persist" , no_argument , 0 , 0 } , | |||
{"pid-file" , required_argument , 0 , 0 } , | {"pid-file" , required_argument , 0 , 0 } , | |||
{"port" , required_argument , 0 , 0 } , | {"port" , required_argument , 0 , 0 } , | |||
{"process-and-exit" , no_argument , 0 , 0 } , | {"process-and-exit" , no_argument , 0 , 0 } , | |||
{"real-os" , no_argument , 0 , 0 } , | {"real-os" , no_argument , 0 , 0 } , | |||
{"real-time-html" , no_argument , 0 , 0 } , | {"real-time-html" , no_argument , 0 , 0 } , | |||
{"restore" , no_argument , 0 , 0 } , | {"restore" , no_argument , 0 , 0 } , | |||
{"sort-panel" , required_argument , 0 , 0 } , | {"sort-panel" , required_argument , 0 , 0 } , | |||
{"static-file" , required_argument , 0 , 0 } , | {"static-file" , required_argument , 0 , 0 } , | |||
{"tz" , required_argument , 0 , 0 } , | {"tz" , required_argument , 0 , 0 } , | |||
{"unknowns-as-crawlers" , no_argument , 0 , 0 } , | ||||
{"user-name" , required_argument , 0 , 0 } , | {"user-name" , required_argument , 0 , 0 } , | |||
#ifdef HAVE_LIBSSL | #ifdef HAVE_LIBSSL | |||
{"ssl-cert" , required_argument , 0 , 0 } , | {"ssl-cert" , required_argument , 0 , 0 } , | |||
{"ssl-key" , required_argument , 0 , 0 } , | {"ssl-key" , required_argument , 0 , 0 } , | |||
#endif | #endif | |||
{"time-format" , required_argument , 0 , 0 } , | {"time-format" , required_argument , 0 , 0 } , | |||
{"ws-url" , required_argument , 0 , 0 } , | {"ws-url" , required_argument , 0 , 0 } , | |||
{"ping-interval" , required_argument , 0 , 0 } , | {"ping-interval" , required_argument , 0 , 0 } , | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
{"geoip-database" , required_argument , 0 , 0 } , | {"geoip-database" , required_argument , 0 , 0 } , | |||
skipping to change at line 315 | skipping to change at line 316 | |||
" --process-and-exit - Parse log and exit without outputting dat a.\n" | " --process-and-exit - Parse log and exit without outputting dat a.\n" | |||
" --real-os - Display real OS names. e.g, Windows XP,\n " | " --real-os - Display real OS names. e.g, Windows XP,\n " | |||
" Snow Leopard.\n" | " Snow Leopard.\n" | |||
" --restore - Restore data from disk from the given\n" | " --restore - Restore data from disk from the given\n" | |||
" --db-path or from /tmp.\n" | " --db-path or from /tmp.\n" | |||
" --sort-panel=PANEL,METRIC,ORDER - Sort panel on initial load. e.g.,\n" | " --sort-panel=PANEL,METRIC,ORDER - Sort panel on initial load. e.g.,\n" | |||
" --sort-panel=VISITORS,BY_HITS,ASC.\n" | " --sort-panel=VISITORS,BY_HITS,ASC.\n" | |||
" See manpage for a list of panels/fields.\ n" | " See manpage for a list of panels/fields.\ n" | |||
" --static-file=<extension> - Add static file extension. e.g.: .mp3.\n" | " --static-file=<extension> - Add static file extension. e.g.: .mp3.\n" | |||
" Extensions are case sensitive.\n" | " Extensions are case sensitive.\n" | |||
" --unknowns-as-crawlers - Classify unknown OS and browsers as crawl ers.\n" | ||||
"\n" | "\n" | |||
/* GeoIP Options */ | /* GeoIP Options */ | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
CYN "GEOIP OPTIONS" RESET | CYN "GEOIP OPTIONS" RESET | |||
"\n\n" | "\n\n" | |||
#ifdef HAVE_LIBGEOIP | #ifdef HAVE_LIBGEOIP | |||
" -g --std-geoip - Standard GeoIP database for less memory\n " | " -g --std-geoip - Standard GeoIP database for less memory\n " | |||
" consumption (legacy DB).\n" | " consumption (legacy DB).\n" | |||
#endif | #endif | |||
skipping to change at line 688 | skipping to change at line 690 | |||
if (!strcmp ("sort-panel", name)) | if (!strcmp ("sort-panel", name)) | |||
set_array_opt (oarg, conf.sort_panels, &conf.sort_panel_idx, TOTAL_MODULES); | set_array_opt (oarg, conf.sort_panels, &conf.sort_panel_idx, TOTAL_MODULES); | |||
/* static file */ | /* static file */ | |||
if (!strcmp ("static-file", name) && conf.static_file_idx < MAX_EXTENSIONS) { | if (!strcmp ("static-file", name) && conf.static_file_idx < MAX_EXTENSIONS) { | |||
if (conf.static_file_max_len < strlen (oarg)) | if (conf.static_file_max_len < strlen (oarg)) | |||
conf.static_file_max_len = strlen (oarg); | conf.static_file_max_len = strlen (oarg); | |||
set_array_opt (oarg, conf.static_files, &conf.static_file_idx, MAX_EXTENSION S); | set_array_opt (oarg, conf.static_files, &conf.static_file_idx, MAX_EXTENSION S); | |||
} | } | |||
/* classify unknowns as crawlers */ | ||||
if (!strcmp ("unknowns-as-crawlers", name)) | ||||
conf.unknowns_as_crawlers = 1; | ||||
/* GEOIP OPTIONS | /* GEOIP OPTIONS | |||
* ========================= */ | * ========================= */ | |||
/* specifies the path of the GeoIP City database file */ | /* specifies the path of the GeoIP City database file */ | |||
if (!strcmp ("geoip-database", name)) | if (!strcmp ("geoip-database", name) && conf.geoip_db_idx < MAX_GEOIP_DBS) | |||
conf.geoip_database = oarg; | set_array_opt (oarg, conf.geoip_databases, &conf.geoip_db_idx, MAX_GEOIP_DBS | |||
); | ||||
/* default config file --dwf */ | /* default config file --dwf */ | |||
if (!strcmp ("dcf", name)) { | if (!strcmp ("dcf", name)) { | |||
display_default_config_file (); | display_default_config_file (); | |||
exit (EXIT_SUCCESS); | exit (EXIT_SUCCESS); | |||
} | } | |||
} | } | |||
/* Determine if the '--no-global-config' command line option needs to be | /* Determine if the '--no-global-config' command line option needs to be | |||
* enabled or not. */ | * enabled or not. */ | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 9 lines changed or added |