User GLib log messages instead of printing to stderr, but only set log
handler to syslog after successfully start waiting for connections.
Then, the user will get proper error messages at the console if proxy
cannot be started.
struct pop_address pop_address;
gnutls_global_init ();
struct pop_address pop_address;
gnutls_global_init ();
configfile = CONFFILE;
opt_ctx = g_option_context_new ("");
g_option_context_add_main_entries (opt_ctx, opt_entries, NULL);
configfile = CONFFILE;
opt_ctx = g_option_context_new ("");
g_option_context_add_main_entries (opt_ctx, opt_entries, NULL);
- if (!g_option_context_parse (opt_ctx, &argc, &argv, NULL))
+
+ error = NULL;
+ if (!g_option_context_parse (opt_ctx, &argc, &argv, &error))
- g_log (NULL, G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL,
- "Could not parse command line options.");
+ g_critical ("Could not parse command line options: %s.",
+ error->message);
+ g_error_free (error);
+ exit (1);
}
g_option_context_free (opt_ctx);
}
g_option_context_free (opt_ctx);
if (g_key_file_load_from_file (keyfile, configfile,
G_KEY_FILE_NONE, &error) == FALSE)
{
if (g_key_file_load_from_file (keyfile, configfile,
G_KEY_FILE_NONE, &error) == FALSE)
{
- fprintf (stderr, "Could not load configuration file %s: %s.\n",
- configfile, error->message);
+ g_critical ("Could not load configuration file %s: %s.",
+ configfile, error->message);
g_error_free (error);
exit (1);
}
g_error_free (error);
exit (1);
}
server_address = g_strdup ("127.0.0.1");
g_error_free (error);
}
server_address = g_strdup ("127.0.0.1");
g_error_free (error);
}
server_port = g_key_file_get_string (keyfile, "global", "server_port",
&error);
if (server_port == NULL && error != NULL)
server_port = g_key_file_get_string (keyfile, "global", "server_port",
&error);
if (server_port == NULL && error != NULL)
server_fd = hc_tcp_server (port);
if (server_fd < 0)
{
server_fd = hc_tcp_server (port);
if (server_fd < 0)
{
- fprintf (stderr, "Could not create server.\n");
+ g_critical ("Could not create server.");
exit (1);
}
hc_server_add_watch (server_fd, new_client, &pop_address);
exit (1);
}
hc_server_add_watch (server_fd, new_client, &pop_address);
g_message ("Listening at %s:%s.", conf_address, port);
if (!foreground)
g_message ("Listening at %s:%s.", conf_address, port);
if (!foreground)