diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-11-08 18:44:12 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-11-08 18:44:12 +0100 |
| commit | 1139f74ffe89ea31b5a15f0a2c174e054e19e2b6 (patch) | |
| tree | 9f8e5a9f07773d23e4f216205097a5857bba25e6 /src | |
| parent | f8af22b882f734c3d7dd0bcaf4673552d0a616c4 (diff) | |
| download | exchange-1139f74ffe89ea31b5a15f0a2c174e054e19e2b6.tar.gz exchange-1139f74ffe89ea31b5a15f0a2c174e054e19e2b6.tar.bz2 exchange-1139f74ffe89ea31b5a15f0a2c174e054e19e2b6.zip | |
fix minor wire auditor bugs, add samples of output
Diffstat (limited to 'src')
| -rw-r--r-- | src/auditor/taler-wire-auditor.c | 10 | ||||
| -rw-r--r-- | src/auditordb/plugin_auditordb_postgres.c | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c index c61d2a386..13a293c36 100644 --- a/src/auditor/taler-wire-auditor.c +++ b/src/auditor/taler-wire-auditor.c @@ -327,12 +327,16 @@ do_shutdown (void *cls) report_row_inconsistencies, "row_minor_inconsistencies", report_row_minor_inconsistencies); + GNUNET_break (NULL != report); json_dumpf (report, stdout, JSON_INDENT (2)); json_decref (report); + report_wire_out_inconsistencies = NULL; + report_reserve_in_inconsistencies = NULL; report_row_inconsistencies = NULL; report_row_minor_inconsistencies = NULL; + report_missattribution_in_inconsistencies = NULL; } if (NULL != hh) { @@ -842,7 +846,9 @@ reserve_in_cb (void *cls, "row", (json_int_t) rowid, "wire_offset_hash", GNUNET_JSON_from_data_auto (&rii->row_off_hash), "diagnostic", "duplicate wire offset")); - return GNUNET_SYSERR; + json_decref (rii->details.account_details); + GNUNET_free (rii); + return GNUNET_OK; } pp.last_reserve_in_serial_id = rowid + 1; return GNUNET_OK; @@ -1198,6 +1204,8 @@ run (void *cls, (report_row_minor_inconsistencies = json_array ())); GNUNET_assert (NULL != (report_row_inconsistencies = json_array ())); + GNUNET_assert (NULL != + (report_missattribution_in_inconsistencies = json_array ())); GNUNET_assert (GNUNET_OK == TALER_amount_get_zero (currency, &total_bad_amount_out_plus)); diff --git a/src/auditordb/plugin_auditordb_postgres.c b/src/auditordb/plugin_auditordb_postgres.c index 1001ba952..27f560a4f 100644 --- a/src/auditordb/plugin_auditordb_postgres.c +++ b/src/auditordb/plugin_auditordb_postgres.c @@ -1389,11 +1389,11 @@ postgres_update_wire_auditor_progress (void *cls, struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&pp->last_reserve_in_serial_id), GNUNET_PQ_query_param_uint64 (&pp->last_wire_out_serial_id), - GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_fixed_size (in_wire_off, wire_off_size), GNUNET_PQ_query_param_fixed_size (out_wire_off, wire_off_size), + GNUNET_PQ_query_param_auto_from_type (master_pub), GNUNET_PQ_query_param_end }; @@ -1428,9 +1428,9 @@ postgres_get_wire_auditor_progress (void *cls, GNUNET_PQ_query_param_end }; struct GNUNET_PQ_ResultSpec rs[] = { - GNUNET_PQ_result_spec_uint64 ("last_reserve_in_serial_id", + GNUNET_PQ_result_spec_uint64 ("last_wire_reserve_in_serial_id", &pp->last_reserve_in_serial_id), - GNUNET_PQ_result_spec_uint64 ("last_wire_out_serial_id", + GNUNET_PQ_result_spec_uint64 ("last_wire_wire_out_serial_id", &pp->last_wire_out_serial_id), GNUNET_PQ_result_spec_variable_size ("wire_in_off", in_wire_off, |