working commit

app/config/config.go

@@ -10,7 +10,6 @@
 package config
 
 import (
-	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -103,32 +102,6 @@ func (conf *Config) ReadConfigfile() error {
 	return err
 }
 
-func (conf *Config) ReadOptions() error {
-	var err error
-	exename := filepath.Base(os.Args[0])
-
-	// TODO: make local scope of flags
-
-	flagSet := flag.NewFlagSet(exename, flag.ExitOnError)
-	flagSet.Int64Var(&conf.Service.Port, "port", conf.Service.Port, "listen port")
-	flagSet.BoolVar(&conf.AsDaemon, "daemon", conf.AsDaemon, "run as daemon")
-
-	help := func() {
-		fmt.Println("")
-		fmt.Printf("Usage: %s [option]\n", exename)
-		fmt.Println("")
-		fmt.Println("Options:")
-		flagSet.PrintDefaults()
-		fmt.Println("")
-	}
-	flagSet.Usage = help
-	args := flag.Args()
-	if len(args) > 1 {
-		flagSet.Parse(args)
-	}
-	return err
-}
-
 func (conf *Config) ReadX509Cert() error {
 	var err error
 	if conf.Certpath != "" && conf.Keypath != "" {

app/server/server.go

@@ -78,6 +78,10 @@ func (srv *Server) SetPort(port int64) {
 	srv.conf.Service.Port = port
 }
 
+func (srv *Server) SetAsDaemon(asDaemon bool) {
+	srv.conf.AsDaemon = asDaemon
+}
+
 func (srv *Server) Configure() error {
 	var err error
 	srv.logg.Infof("Configuration server")
@@ -94,11 +98,6 @@ func (srv *Server) Configure() error {
 	if err != nil {
 		return err
 	}
-
-	err = srv.conf.ReadOptions()
-	if err != nil {
-		return err
-	}
 	return err
 }
 
@@ -159,7 +158,7 @@ func (srv *Server) Build() error {
 
 	// Creating datadir
 	datadir := srv.conf.Datadir
-	if !auxtool.DirExists(datadir) {
+	if !auxtool.DirExists(datadir) { // TODO: check access to dir
 		srv.logg.Infof("Creating data directory %s ", datadir)
 		err = os.MkdirAll(datadir, 0750)
 		if err != nil {