Merge pull request #1823 from bingoohuang/master

feature: support command line arguments in a configuration file
4 years ago · 258e93bc86
5 changed files with 1152 additions and 4 deletions
--- a/weed/command/command.go
+++ b/weed/command/command.go
@ -1,8 +1,8 @@
 package command
 import (
 	"flag"
 	"fmt"
 	flag "github.com/chrislusf/seaweedfs/weed/util/fla9"
 	"os"
 	"strings"
 )
--- a/weed/glog/glog.go
+++ b/weed/glog/glog.go
@ -74,8 +74,8 @@ import (
 	"bufio"
 	"bytes"
 	"errors"
 	"flag"
 	"fmt"
 	flag "github.com/chrislusf/seaweedfs/weed/util/fla9"
 	"io"
 	stdLog "log"
 	"os"
--- a/weed/glog/glog_file.go
+++ b/weed/glog/glog_file.go
@ -20,8 +20,8 @@ package glog
 import (
 	"errors"
 	"flag"
 	"fmt"
 	flag "github.com/chrislusf/seaweedfs/weed/util/fla9"
 	"os"
 	"os/user"
 	"path/filepath"
--- a/weed/util/fla9/fla9.go
+++ b/weed/util/fla9/fla9.go
--- a/weed/weed.go
+++ b/weed/weed.go
@ -4,8 +4,8 @@
 package main
 import (
 	"flag"
 	"fmt"
 	flag "github.com/chrislusf/seaweedfs/weed/util/fla9"
 	"io"
 	"math/rand"
 	"os"