modules: api fixups

modules/block/block.lua

@@ -104,20 +104,20 @@ block.layer = {
 	produce = function(state, req, pkt)
 		-- Interpret packet in Lua and evaluate
 		local qry = kres.query_current(req)
-		local qname = kres.query_qname(qry)
+		local qname = kres.query.qname(qry)
 		local action, authority = block:evaluate(pkt, qname)
 		if action == block.DENY then
 			-- Answer full question
-			local qclass = kres.query_qclass(qry)
-			local qtype = kres.query_qtype(qry)
-			kres.query_flag(qry, kres.query.NO_MINIMIZE + kres.query.SAFEMODE)
-			pkt:question(qname, qclass, qtype)
+			local qclass = kres.query.qclass(qry)
+			local qtype = kres.query.qtype(qry)
+			kres.query.flag(qry, kres.query.NO_MINIMIZE + kres.query.SAFEMODE)
+			pkt:question(qname, qtype, qclass)
 			pkt:flag(kres.wire.QR)
 			pkt:flag(kres.wire.AA)
 			-- Write authority information
 			pkt:rcode(kres.rcode.NXDOMAIN)
 			pkt:begin(kres.AUTHORITY)
-			pkt:add(authority, qclass, kres.rrtype.SOA, 900,
+			pkt:add(authority, qclass, kres.type.SOA, 900,
 				'\5block\0\0\0\0\0\0\0\0\14\16\0\0\3\132\0\9\58\128\0\0\3\132')
 			return kres.DONE
 		elseif action == block.DROP then

modules/graphite/graphite.lua

@@ -35,6 +35,7 @@ function graphite.publish()
 	end
 	publish_table(now_metrics, graphite.prefix)
 	publish_table(cache.stats(), graphite.prefix..'.cache')
+	publish_table(worker.stats(), graphite.prefix..'.worker')
 	return 0
 end
 

modules/stats/stats.c

@@ -57,7 +57,6 @@ static int begin(knot_layer_t *ctx, void *module_param)
 {
 	struct kr_module *module = ctx->api->data;
 	map_t *map = module->data;
-	stat_add(map, "query.concurrent", 1);
 	ctx->data = module_param;
 	return ctx->state;
 }
@@ -101,24 +100,12 @@ static int collect(knot_layer_t *ctx)
 		}
 	}
 	/* Query parameters and transport mode */
-	stat_add(map, "query.concurrent", -1);
 	if (knot_pkt_has_edns(param->answer)) {
 		stat_add(map, "query.edns", 1);
 		if (knot_pkt_has_dnssec(param->answer)) {
 			stat_add(map, "query.dnssec", 1);
 		}
 	}
-	/* Collect data from iterator queries */
-	struct kr_query *qry = NULL;
-	WALK_LIST(qry, rplan->resolved) {
-		if (!(qry->flags & QUERY_CACHED) && qry != TAIL(rplan->resolved)) {
-			if (qry->flags & QUERY_TCP) {
-				stat_add(map, "iterator.tcp", 1);
-			} else {
-				stat_add(map, "iterator.udp", 1);
-			}
-		}
-	}
 	return ctx->state;
 }