参数支持方式修改

polaris1119 · polaris1119 · commit 54dc9825a957 · 2016-05-27T22:26:14.000+08:00
diff --git a/websites/code2/studygolang/src/global/app.go b/websites/code2/studygolang/src/global/app.go
@@ -55,10 +55,6 @@ const (
 )
 
 func init() {
-	if !flag.Parsed() {
-		flag.Parse()
-	}
-
 	App.Name = os.Args[0]
 	App.Version = "V2.0.0"
 	App.Build = Build
@@ -71,19 +67,23 @@ func init() {
 	App.Date = fileInfo.ModTime()
 
 	App.Env = config.ConfigFile.MustValue("global", "env")
-
-	if showVersion != nil && *showVersion {
-		PrintVersion(os.Stdout)
-		os.Exit(0)
-	}
 }
 
 func PrintVersion(w io.Writer) {
+	if !flag.Parsed() {
+		flag.Parse()
+	}
+
+	if showVersion == nil || !*showVersion {
+		return
+	}
+
 	fmt.Fprintf(w, "Binary: %s\n", App.Name)
 	fmt.Fprintf(w, "Version: %s\n", App.Version)
 	fmt.Fprintf(w, "Build: %s\n", App.Build)
 	fmt.Fprintf(w, "Compile date: %s\n", App.Date.Format("2006-01-02 15:04:05"))
 	fmt.Fprintf(w, "Env: %s\n", App.Env)
+	os.Exit(0)
 }
 
 func OnlineEnv() bool {
diff --git a/websites/code2/studygolang/src/logic/searcher.go b/websites/code2/studygolang/src/logic/searcher.go
@@ -37,6 +37,7 @@ func (self SearcherLogic) Indexing(isAll bool) {
 	self.IndexingArticle(isAll)
 	self.IndexingTopic(isAll)
 	self.IndexingResource(isAll)
+	self.IndexingOpenProject(isAll)
 }
 
 // IndexingArticle 索引博文
@@ -403,6 +404,8 @@ func (this *SolrClient) Post() error {
 
 	stringBuilder.Append("}")
 
+	logger.Infoln("start post data to solr...")
+
 	resp, err := http.Post(config.ConfigFile.MustValue("search", "engine_url")+"/update?wt=json&commit=true", "application/json", stringBuilder)
 	if err != nil {
 		logger.Errorln("post error:", err)
@@ -418,5 +421,7 @@ func (this *SolrClient) Post() error {
 		return err
 	}
 
+	logger.Infoln("post data result:", result)
+
 	return nil
 }
diff --git a/websites/code2/studygolang/src/server/indexer/main.go b/websites/code2/studygolang/src/server/indexer/main.go
@@ -23,13 +23,13 @@ var manualIndex = flag.Bool("manual", false, "do manual index once or not")
 func init() {
 	// 设置随机数种子
 	rand.Seed(time.Now().Unix())
+}
 
+func main() {
 	if !flag.Parsed() {
 		flag.Parse()
 	}
-}
 
-func main() {
 	logger.Init(ROOT+"/log", ConfigFile.MustValue("global", "log_level", "DEBUG"))
 
 	if *manualIndex {
diff --git a/websites/code2/studygolang/src/server/studygolang/main.go b/websites/code2/studygolang/src/server/studygolang/main.go
@@ -39,6 +39,9 @@ func init() {
 }
 
 func main() {
+	// 支持根据参数打印版本信息
+	global.PrintVersion(os.Stdout)
+
 	savePid()
 
 	logger.Init(ROOT+"/log", ConfigFile.MustValue("global", "log_level", "DEBUG"))

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ func (self SearcherLogic) Indexing(isAll bool) {`
`37`	`37`	`self.IndexingArticle(isAll)`
`38`	`38`	`self.IndexingTopic(isAll)`
`39`	`39`	`self.IndexingResource(isAll)`
	`40`	`+ self.IndexingOpenProject(isAll)`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`// IndexingArticle 索引博文`
`@@ -403,6 +404,8 @@ func (this *SolrClient) Post() error {`
`403`	`404`
`404`	`405`	`stringBuilder.Append("}")`
`405`	`406`
	`407`	`+ logger.Infoln("start post data to solr...")`
	`408`	`+`
`406`	`409`	`resp, err := http.Post(config.ConfigFile.MustValue("search", "engine_url")+"/update?wt=json&commit=true", "application/json", stringBuilder)`
`407`	`410`	`if err != nil {`
`408`	`411`	`logger.Errorln("post error:", err)`
`@@ -418,5 +421,7 @@ func (this *SolrClient) Post() error {`
`418`	`421`	`return err`
`419`	`422`	`}`
`420`	`423`
	`424`	`+ logger.Infoln("post data result:", result)`
	`425`	`+`
`421`	`426`	`return nil`
`422`	`427`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ func init() {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func main() {`
	`42`	`+ // 支持根据参数打印版本信息`
	`43`	`+ global.PrintVersion(os.Stdout)`
	`44`	`+`
`42`	`45`	`savePid()`
`43`	`46`
`44`	`47`	`logger.Init(ROOT+"/log", ConfigFile.MustValue("global", "log_level", "DEBUG"))`