Selaa lähdekoodia

[Minor] Set proper exit code on errors in rspamc

Issue: #2627
Closes: #2627
tags/1.8.2
Vsevolod Stakhov 5 vuotta sitten
vanhempi
commit
ebe9a34471
1 muutettua tiedostoa jossa 8 lisäystä ja 1 poistoa
  1. 8
    1
      src/client/rspamc.c

+ 8
- 1
src/client/rspamc.c Näytä tiedosto

@@ -68,6 +68,8 @@ static gchar *user_agent = "rspamc";
static GList *children;
static GPatternSpec **exclude_compiled = NULL;

static gint retcode = EXIT_SUCCESS;

#define ADD_CLIENT_HEADER(o, n, v) do { \
struct rspamd_http_client_header *nh; \
nh = g_malloc (sizeof (*nh)); \
@@ -1588,6 +1590,10 @@ rspamc_client_cb (struct rspamd_client_connection *conn,
rspamd_client_destroy (conn);
g_free (cbdata->filename);
g_free (cbdata);

if (err) {
retcode = EXIT_FAILURE;
}
}

static void
@@ -2017,5 +2023,6 @@ main (gint argc, gchar **argv, gchar **env)
g_pattern_spec_free (exclude_compiled[i]);
}

return ret;
/* Mix retcode (return from Rspamd side) and ret (return from subprocess) */
return ret ^ retcode;
}

Loading…
Peruuta
Tallenna