~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add schedule-* commmands to completion.bash
[disorder]
/
server
/
state.c
diff --git
a/server/state.c
b/server/state.c
index
3386cd4
..
ad90425
100644
(file)
--- a/
server/state.c
+++ b/
server/state.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005
, 2007, 2008
Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-46,6
+46,7
@@
#include "server.h"
#include "printf.h"
#include "addr.h"
#include "server.h"
#include "printf.h"
#include "addr.h"
+#include "schedule.h"
static const char *current_unix;
static int current_unix_fd;
static const char *current_unix;
static int current_unix_fd;
@@
-69,14
+70,10
@@
static void reset_socket(ev_source *ev) {
char *name;
static const struct addrinfo pref = {
char *name;
static const struct addrinfo pref = {
- AI_PASSIVE,
- PF_INET,
- SOCK_STREAM,
- IPPROTO_TCP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = AI_PASSIVE,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
};
/* unix first */
};
/* unix first */
@@
-158,7
+155,9
@@
int reconfigure(ev_source *ev, int reload) {
/* We only allow for upgrade at startup */
trackdb_open(TRACKDB_CAN_UPGRADE);
if(need_another_rescan)
/* We only allow for upgrade at startup */
trackdb_open(TRACKDB_CAN_UPGRADE);
if(need_another_rescan)
- trackdb_rescan(ev, 1/*check*/);
+ trackdb_rescan(ev, 1/*check*/, 0, 0);
+ /* Arrange timeouts for schedule actions */
+ schedule_init(ev);
if(!ret) {
queue_read();
recent_read();
if(!ret) {
queue_read();
recent_read();