projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move update_keys to keydb rather than merge.
[onak.git]
/
add.c
diff --git
a/add.c
b/add.c
index a784fac358fb4d9565c84dfb274734b2c61d89df..189444e294fb2d83af8869b3c943504c30fba810 100644
(file)
--- a/
add.c
+++ b/
add.c
@@
-13,6
+13,7
@@
#include "armor.h"
#include "cleankey.h"
#include "armor.h"
#include "cleankey.h"
+#include "cleanup.h"
#include "charfuncs.h"
#include "getcgi.h"
#include "keydb.h"
#include "charfuncs.h"
#include "getcgi.h"
#include "keydb.h"
@@
-63,11
+64,14
@@
int main(int argc, char *argv[])
&ctx,
&packets);
if (packets != NULL) {
&ctx,
&packets);
if (packets != NULL) {
- printf("Storing %d keys.\n",
- parse_keys(packets, &keys));
+ count = parse_keys(packets, &keys);
+ logthing(LOGTHING_NOTICE, "Received %d keys.",
+ count);
+ printf("Storing %d keys.\n", count);
end_html();
fclose(stdout);
fclose(stderr);
end_html();
fclose(stdout);
fclose(stderr);
+ catchsignals();
initdb(false);
count = cleankeys(keys);
initdb(false);
count = cleankeys(keys);
@@
-75,7
+79,6
@@
int main(int argc, char *argv[])
count);
count = update_keys(&keys);
count);
count = update_keys(&keys);
- printf("Got %d new keys.\n", count);
logthing(LOGTHING_NOTICE, "Got %d new keys.",
count);
if (keys != NULL) {
logthing(LOGTHING_NOTICE, "Got %d new keys.",
count);
if (keys != NULL) {