vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow -httpprofile for diff import

master
Oliver Tonnhofer 2013-10-30 11:14:34 +01:00
parent 0461fd56fe
commit 60a4eb7f4d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.go
View File

@ -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")

8
imposm3.go
View File

@ -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