From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Fri, 13 Nov 2015 12:43:06 +0000 (+0100)
Subject: modules/tinyweb: cleanup on exit
X-Git-Tag: v1.0.0-beta2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf508c7bef2873a5a98e8584632697cc3e030586;p=thirdparty%2Fknot-resolver.git

modules/tinyweb: cleanup on exit
---

diff --git a/modules/modules.mk b/modules/modules.mk
index 502892459..1762f2aea 100644
--- a/modules/modules.mk
+++ b/modules/modules.mk
@@ -58,7 +58,7 @@ endef
 define go_target 
 $(1) := $(2)/$(1)$(LIBEXT)
 $(2)/$(1)$(LIBEXT): $$($(1)_SOURCES) $$($(1)_DEPEND)
-	@echo "  GO	$(2)"; CGO_CFLAGS="$(BUILD_CFLAGS)" CGO_LDFLAGS="$$($(1)_LIBS)" $(GO) build -buildmode=c-shared -o $$@ $$($(1)_SOURCES)
+	@echo "  GO	$(2)"; CGO_CFLAGS="$(BUILD_CFLAGS)" CGO_LDFLAGS="$$($(1)_LIBS) $(CFLAGS)" $(GO) build -buildmode=c-shared -o $$@ $$($(1)_SOURCES)
 $(1)-clean:
 	$(RM) -r $(2)/$(1).h $(2)/$(1)$(LIBEXT)
 ifeq ($$(strip $$($(1)_INSTALL)),)
diff --git a/modules/tinyweb/tinyweb.go b/modules/tinyweb/tinyweb.go
index 16aa1bd25..23e736f0d 100644
--- a/modules/tinyweb/tinyweb.go
+++ b/modules/tinyweb/tinyweb.go
@@ -14,6 +14,7 @@ static inline const knot_layer_api_t *_layer(void)
 import "C"
 import (
 	"os"
+	"runtime"
 	"unsafe"
 	"fmt"
 	"net"
@@ -187,6 +188,9 @@ func tinyweb_config(module *C.struct_kr_module, conf *C.char) int {
 
 //export tinyweb_deinit
 func tinyweb_deinit(module *C.struct_kr_module) int {
+	geo_db = nil
+	geo_db6 = nil
+	runtime.GC()
 	return 0
 }