From 60a4eb7f4d44233d57a3b24fdfa7fe0606e776a6 Mon Sep 17 00:00:00 2001
From: Oliver Tonnhofer <olt@bogosoft.com>
Date: Wed, 30 Oct 2013 11:14:34 +0100
Subject: [PATCH] allow -httpprofile for diff import

---
 config/config.go | 8 ++------
 imposm3.go       | 8 +++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/config.go b/config/config.go
index 2971b80..992c11d 100644
--- a/config/config.go
+++ b/config/config.go
@@ -32,6 +32,7 @@ type _BaseOptions struct {
 	LimitTo            string
 	LimitToCacheBuffer float64
 	ConfigFile         string
+	Httpprofile        string
 }
 
 func (o *_BaseOptions) updateFromConfig() error {
@@ -88,9 +89,6 @@ func (o *_BaseOptions) check() []error {
 }
 
 type _ImportOptions struct {
-	Cpuprofile       string
-	Httpprofile      string
-	Memprofile       string
 	Overwritecache   bool
 	Appendcache      bool
 	Read             string
@@ -113,6 +111,7 @@ func addBaseFlags(flags *flag.FlagSet) {
 	flags.IntVar(&BaseOptions.Srid, "srid", defaultSrid, "srs id")
 	flags.StringVar(&BaseOptions.LimitTo, "limitto", "", "limit to geometries")
 	flags.StringVar(&BaseOptions.ConfigFile, "config", "", "config (json)")
+	flags.StringVar(&BaseOptions.Httpprofile, "httpprofile", "", "bind address for profile server")
 }
 
 func UsageImport() {
@@ -133,9 +132,6 @@ func init() {
 
 	addBaseFlags(DiffFlags)
 	addBaseFlags(ImportFlags)
-	ImportFlags.StringVar(&ImportOptions.Cpuprofile, "cpuprofile", "", "filename of cpu profile output")
-	ImportFlags.StringVar(&ImportOptions.Httpprofile, "httpprofile", "", "bind address for profile server")
-	ImportFlags.StringVar(&ImportOptions.Memprofile, "memprofile", "", "dir name of mem profile output and interval (fname:interval)")
 	ImportFlags.BoolVar(&ImportOptions.Overwritecache, "overwritecache", false, "overwritecache")
 	ImportFlags.BoolVar(&ImportOptions.Appendcache, "appendcache", false, "append cache")
 	ImportFlags.StringVar(&ImportOptions.Read, "read", "", "read")
diff --git a/imposm3.go b/imposm3.go
index 493949e..1f9abe3 100644
--- a/imposm3.go
+++ b/imposm3.go
@@ -42,13 +42,15 @@ func main() {
 	switch os.Args[1] {
 	case "import":
 		config.ParseImport(os.Args[2:])
-		if config.ImportOptions.Httpprofile != "" {
-			stats.StartHttpPProf(config.ImportOptions.Httpprofile)
+		if config.BaseOptions.Httpprofile != "" {
+			stats.StartHttpPProf(config.BaseOptions.Httpprofile)
 		}
 		import_.Import()
 	case "diff":
 		config.ParseDiffImport(os.Args[2:])
-
+		if config.BaseOptions.Httpprofile != "" {
+			stats.StartHttpPProf(config.BaseOptions.Httpprofile)
+		}
 		var geometryLimiter *limit.Limiter
 		if config.BaseOptions.LimitTo != "" {
 			var err error