port missing 'panic logs go to the same log file as everything else' to master

Server/main.go

@@ -44,7 +44,6 @@ func main() {
 	var generateTrafficRulesFilename string
 	var generateServerEntryFilename string
 	var generateLogFilename string
-	var generatePanicLogFilename string
 	var generateServerIPaddress string
 	var generateServerNetworkInterface string
 	var generateWebServerPort int
@@ -69,12 +68,6 @@ func main() {
 		"",
 		"set application log file name and path; blank for stderr")
 
-	flag.StringVar(
-		&generatePanicLogFilename,
-		"panicLogFilename",
-		"",
-		"set application log file name and path for recording un-recovered panics; blank for stderr")
-
 	flag.StringVar(
 		&generateServerIPaddress,
 		"ipaddress",
@@ -150,7 +143,6 @@ func main() {
 			server.GenerateConfig(
 				&server.GenerateConfigParams{
 					LogFilename:          generateLogFilename,
-					PanicLogFilename:     generatePanicLogFilename,
 					ServerIPAddress:      serverIPaddress,
 					EnableSSHAPIRequests: true,
 					WebServerPort:        generateWebServerPort,
@@ -242,9 +234,10 @@ func panicHandler(output string) {
 		logEvent["event_name"] = "panic"
 		logEvent["panic"] = output
 
+		// Logs are written to the configured file name. If no name is specified, logs are written to stderr
 		var jsonWriter io.Writer
-		if config.PanicLogFilename != "" {
-			panicLog, err := rotate.NewRotatableFileWriter(config.PanicLogFilename, 0666)
+		if config.LogFilename != "" {
+			panicLog, err := rotate.NewRotatableFileWriter(config.LogFilename, 0666)
 			if err != nil {
 				fmt.Printf("unable to set panic log output: %s\n%s\n", err, output)
 				os.Exit(1)