mirror of https://github.com/v2ray/v2ray-core
				
				
				
			remove unnecessary code in main
							parent
							
								
									67793eb3e0
								
							
						
					
					
						commit
						bd9b7c586e
					
				| 
						 | 
					@ -36,7 +36,6 @@ import (
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var (
 | 
					var (
 | 
				
			||||||
	configFile string
 | 
						configFile string
 | 
				
			||||||
	logLevel   = flag.String("loglevel", "warning", "Level of log info to be printed to console, available value: debug, info, warning, error")
 | 
					 | 
				
			||||||
	version    = flag.Bool("version", false, "Show current version of V2Ray.")
 | 
						version    = flag.Bool("version", false, "Show current version of V2Ray.")
 | 
				
			||||||
	test       = flag.Bool("test", false, "Test config file only, without launching V2Ray server.")
 | 
						test       = flag.Bool("test", false, "Test config file only, without launching V2Ray server.")
 | 
				
			||||||
	format     = flag.String("format", "json", "Format of input file.")
 | 
						format     = flag.String("format", "json", "Format of input file.")
 | 
				
			||||||
| 
						 | 
					@ -52,20 +51,6 @@ func init() {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func startV2Ray() *point.Point {
 | 
					func startV2Ray() *point.Point {
 | 
				
			||||||
	switch *logLevel {
 | 
					 | 
				
			||||||
	case "debug":
 | 
					 | 
				
			||||||
		log.SetLogLevel(log.DebugLevel)
 | 
					 | 
				
			||||||
	case "info":
 | 
					 | 
				
			||||||
		log.SetLogLevel(log.InfoLevel)
 | 
					 | 
				
			||||||
	case "warning":
 | 
					 | 
				
			||||||
		log.SetLogLevel(log.WarningLevel)
 | 
					 | 
				
			||||||
	case "error":
 | 
					 | 
				
			||||||
		log.SetLogLevel(log.ErrorLevel)
 | 
					 | 
				
			||||||
	default:
 | 
					 | 
				
			||||||
		fmt.Println("Unknown log level: " + *logLevel)
 | 
					 | 
				
			||||||
		return nil
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if len(configFile) == 0 {
 | 
						if len(configFile) == 0 {
 | 
				
			||||||
		log.Error("Config file is not set.")
 | 
							log.Error("Config file is not set.")
 | 
				
			||||||
		return nil
 | 
							return nil
 | 
				
			||||||
| 
						 | 
					@ -89,10 +74,6 @@ func startV2Ray() *point.Point {
 | 
				
			||||||
		return nil
 | 
							return nil
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if config.LogConfig != nil && len(config.LogConfig.AccessLog) > 0 {
 | 
					 | 
				
			||||||
		log.InitAccessLogger(config.LogConfig.AccessLog)
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	vPoint, err := point.NewPoint(config)
 | 
						vPoint, err := point.NewPoint(config)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		log.Error("Failed to create Point server: ", err)
 | 
							log.Error("Failed to create Point server: ", err)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue