~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mis-merged trackdb_open().
[disorder]
/
server
/
deadlock.c
diff --git
a/server/deadlock.c
b/server/deadlock.c
index
b53bbd5
..
d90a123
100644
(file)
--- a/
server/deadlock.c
+++ b/
server/deadlock.c
@@
-15,7
+15,11
@@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+/** @file server/deadlock.c
+ * @brief Deadlock monitor
+ *
+ * Spawned by the server.
+ */
#include "disorder-server.h"
static const struct option options[] = {
#include "disorder-server.h"
static const struct option options[] = {
@@
-67,7
+71,7
@@
int main(int argc, char **argv) {
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
- if(config_read(0)) fatal(0, "cannot read configuration");
+ if(config_read(0
, NULL
)) fatal(0, "cannot read configuration");
info("started");
trackdb_init(TRACKDB_NO_RECOVER);
while(getppid() != 1) {
info("started");
trackdb_init(TRACKDB_NO_RECOVER);
while(getppid() != 1) {