diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmdline.opt | 6 | ||||
| -rw-r--r-- | src/config.c | 3 | ||||
| -rw-r--r-- | src/job.c | 18 | ||||
| -rw-r--r-- | src/net.c | 12 | ||||
| -rw-r--r-- | src/process.c | 30 | ||||
| -rw-r--r-- | src/wydawca.c | 10 | ||||
| -rw-r--r-- | src/wydawca.h | 6 |
7 files changed, 58 insertions, 27 deletions
diff --git a/src/cmdline.opt b/src/cmdline.opt index b61517b..8b45791 100644 --- a/src/cmdline.opt +++ b/src/cmdline.opt @@ -21,7 +21,7 @@ static gl_list_t source_list; static gl_list_t tag_list; static bool -source_eq (const void *elt1, const void *elt2) +string_eq (const void *elt1, const void *elt2) { return strcmp ((const char *)elt1, (const char *)elt2) == 0; } @@ -99,7 +99,7 @@ OPTION(spool,S,TAG, BEGIN if (!tag_list) tag_list = gl_list_create_empty (&gl_linked_list_implementation, - source_eq, NULL, + string_eq, NULL, NULL, false); gl_list_add_last (tag_list, optarg); END @@ -109,7 +109,7 @@ OPTION(source,s,SOURCE-DIR, BEGIN if (!source_list) source_list = gl_list_create_empty (&gl_linked_list_implementation, - source_eq, NULL, + string_eq, NULL, NULL, false); gl_list_add_last (source_list, optarg); END diff --git a/src/config.c b/src/config.c index 94afb20..facfcbc 100644 --- a/src/config.c +++ b/src/config.c @@ -1287,6 +1287,9 @@ static struct gconf_keyword wydawca_kw[] = { gconf_type_section, NULL, 0, cb_spool, NULL, spool_kw }, + { "all-spools", NULL, N_("Service names that request scanning all spools"), + gconf_type_string|GCONF_LIST, &all_spool_aliases }, + { NULL } }; @@ -15,6 +15,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "wydawca.h" +#include "mail.h" #define STATE_FINISHED 0x01 #define STATE_QUEUED 0x02 @@ -35,6 +36,8 @@ struct job *queue; size_t jobmax; size_t jobcnt; +static struct spool fake_spool = { "all spools" }; + struct job * job_locate (const struct spool *spool, uid_t uid) { @@ -59,8 +62,18 @@ job_active_count () void wydawca_scanner (struct job *job) { - scan_spool (job->spool, 1, &job->uid); + initstats(); + timer_start ("wydawca"); + if (job->spool == &fake_spool) + scan_all_spools (1, &job->uid); + else + { + spool_create_timers (); + scan_spool (job->spool, 1, &job->uid); + } + timer_stop ("wydawca"); mail_finish (); + logstats (); } int @@ -148,6 +161,9 @@ schedule_job (const struct spool *spool, uid_t uid) { struct job *job; + if (!spool) + spool = &fake_spool; + if (debug_level) logmsg (LOG_DEBUG, _("scheduling job: %s, %lu"), spool->tag, uid); @@ -112,9 +112,14 @@ handle_connection (FILE *fp) spool = wydawca_find_spool (buf); if (!spool) { - fprintf (fp, "- Unknown service name\r\n"); - free (buf); - return; + if (all_spool_aliases && gl_list_search (all_spool_aliases, buf)) + fprintf (fp, "+ OK, all spools\r\n"); + else + { + fprintf (fp, "- Unknown service name\r\n"); + free (buf); + return; + } } else if (spool->url) fprintf (fp, "+ OK, URL %s\r\n", spool->url); @@ -128,6 +133,7 @@ handle_connection (FILE *fp) return; } + trim_crlf (buf); if (debug_level) logmsg (LOG_DEBUG, "recv: %s", buf); diff --git a/src/process.c b/src/process.c index 20bfd38..1a6b01d 100644 --- a/src/process.c +++ b/src/process.c @@ -36,22 +36,9 @@ register_spool (struct spool *spool) static int spool_check_alias (struct spool *spool, const char *name) { - int rc = 0; - - if (spool->aliases) - { - gl_list_iterator_t itr = gl_list_iterator (spool->aliases); - const void *p; - - while (gl_list_iterator_next (&itr, &p, NULL)) - if (strcmp (name, p) == 0) - { - rc = 1; - break; - } - gl_list_iterator_free (&itr); - } - return rc; + if (spool->aliases && gl_list_search (spool->aliases, name)) + return 1; + return 0; } struct spool * @@ -248,12 +235,11 @@ close_methods (struct spool *spool) /* Scan all configured update directories */ void -scan_directories (int uidc, uid_t *uidv) +scan_all_spools (int uidc, uid_t *uidv) { struct spool_list *sp; timer_start ("wydawca"); - for (sp = spool_list; sp; sp = sp->next) if (enabled_spool_p (&sp->spool)) scan_spool (&sp->spool, uidc, uidv); @@ -263,3 +249,11 @@ scan_directories (int uidc, uid_t *uidv) timer_stop ("wydawca"); } +void +spool_create_timers () +{ + struct spool_list *sp; + + for (sp = spool_list; sp; sp = sp->next) + timer_start (sp->spool.tag); +} diff --git a/src/wydawca.c b/src/wydawca.c index cc6c8f0..f9818ed 100644 --- a/src/wydawca.c +++ b/src/wydawca.c @@ -40,11 +40,18 @@ int daemon_mode = 0; int foreground; int single_process; time_t wakeup_interval; +gl_list_t all_spool_aliases; struct gconf_sockaddr listen_sockaddr; unsigned wydawca_stat[MAX_STAT]; +void +initstats () +{ + memset (wydawca_stat, 0, sizeof wydawca_stat); +} + /* Logging */ void @@ -227,6 +234,7 @@ gconf_print_diag (gconf_locus_t *locus, int err, int errcode, const char *msg) } + static int uidc; static uid_t *uidv; @@ -343,7 +351,7 @@ main (int argc, char **argv) if (!daemon_mode) { - scan_directories (uidc, uidv); + scan_all_spools (uidc, uidv); logstats (); } else diff --git a/src/wydawca.h b/src/wydawca.h index 8a716e4..6384738 100644 --- a/src/wydawca.h +++ b/src/wydawca.h @@ -325,6 +325,8 @@ extern int foreground; extern int single_process; extern struct gconf_sockaddr listen_sockaddr; +extern gl_list_t all_spool_aliases; + #define UPDATE_STATS(what) \ do \ { \ @@ -335,6 +337,8 @@ extern struct gconf_sockaddr listen_sockaddr; int stat_mask_p (unsigned long mask); struct metadef *make_stat_expansion (size_t count); +void initstats (void); +void logstats (void); /* Utility functions */ @@ -361,7 +365,7 @@ enum exec_result wydawca_exec (int argc, const char **argv, int *retcode); /* Directory scanning and registering */ void scan_spool (const struct spool *spool, int uc, uid_t *uv); -void scan_directories (int, uid_t *); +void scan_all_spools (int, uid_t *); void register_spool (struct spool *spool); struct spool *wydawca_find_spool (const char *name); |