// Create logger
var log = logrus.New()
-var earlyLog = []string{}
+var logFileInitial = "/tmp/xds-gdb.log"
// Application details
const (
func exitError(code syscall.Errno, f string, a ...interface{}) {
err := fmt.Sprintf(f, a...)
fmt.Fprintf(os.Stderr, err+"\n")
+ log.Debugf("Exit: code=%v, err=%s", code, err)
+
os.Exit(int(code))
}
var listProject bool
var err error
+ // Init Logger and set temporary file and level for the 1st part
+ // IOW while XDS_LOGLEVEL and XDS_LOGFILE options are not parsed
+ logFile = logFileInitial
+ fdL, err := os.OpenFile(logFileInitial, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
+ if err != nil {
+ msgErr := fmt.Sprintf("Cannot create log file %s", logFileInitial)
+ exitError(syscall.EPERM, msgErr)
+ }
+ log.Formatter = &logrus.TextFormatter{}
+ log.Out = fdL
+ log.Level = logrus.DebugLevel
+
uri = "localhost:8000"
logLevel = defaultLogLevel
}
// Process gdb arguments
+ log.Debugf("xds-gdb started with args: %v", os.Args)
args := make([]string, len(os.Args))
args[0] = os.Args[0]
gdbArgs := make([]string, len(os.Args))
for idx, a := range os.Args[1:] {
// Specific case to print help or version of xds-gdb
switch a {
- case "--help", "-h", "--version", "-v":
+ case "--help", "-h", "--version", "-v", "--list", "-ls":
args[1] = a
goto endloop
case "--":
// Source config env file
// (we cannot use confFile var because env variables setting is just after)
envMap, confFile, err := loadConfigEnvFile(os.Getenv("XDS_CONFIG"), gdbCmdFile)
+ log.Infof("Load env config: envMap=%v, confFile=%v, err=%v", envMap, confFile, err)
// Only rise an error when args is not set (IOW when --help or --version is not set)
if len(args) == 1 {
var err error
curDir, _ := os.Getwd()
- // Set logger level, formatter and log file
+ // Build env variables
+ env := []string{}
+ for k, v := range envMap {
+ env = append(env, k+"="+v)
+ }
+
+ // Now set logger level and log file to correct/env var settings
if log.Level, err = logrus.ParseLevel(logLevel); err != nil {
msg := fmt.Sprintf("Invalid log level : \"%v\"\n", logLevel)
return cli.NewExitError(msg, int(syscall.EINVAL))
}
- log.Formatter = &logrus.TextFormatter{}
+ log.Infof("Switch log level to %s", logLevel)
- // Always log into a file
- if logFile == "" {
- logFile = "/tmp/xds-gdb.log"
- }
- fdL, err := os.OpenFile(logFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
- if err != nil {
- msgErr := fmt.Sprintf("Cannot create log file %s", logFile)
- return cli.NewExitError(msgErr, int(syscall.EPERM))
- }
- log.Out = fdL
+ if logFile != logFileInitial {
+ log.Infof("Switch logging to log file %s", logFile)
- // Build env variables
- env := []string{}
- for k, v := range envMap {
- env = append(env, k+"="+v)
+ fdL, err := os.OpenFile(logFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
+ if err != nil {
+ msgErr := fmt.Sprintf("Cannot create log file %s", logFile)
+ return cli.NewExitError(msgErr, int(syscall.EPERM))
+ }
+ defer fdL.Close()
+ log.Out = fdL
}
// Create cross or native gdb interface
gdb.SetConfig("listProject", listProject)
}
- // Log early print
- for _, msg := range earlyLog {
- log.Debugf(msg)
- }
-
// Log useful info
log.Infof("Original arguments: %v", os.Args)
log.Infof("Current directory : %v", curDir)
// Handle client tty / pts
if clientPty != "" {
- log.Infoln("Client tty detected: %v\n", clientPty)
+ log.Infoln("Client tty detected: %v", clientPty)
cpFd, err := os.OpenFile(clientPty, os.O_RDWR, 0)
if err != nil {
go func() {
for {
sig := <-sigs
+
+ // FIXME: skip Window Changed signal for now
+ if sig == syscall.SIGWINCH {
+ log.Debugf("SKIP signal Window Changed")
+ return
+ }
+
if err := gdb.SendSignal(sig); err != nil {
- log.Errorf("Error while sending signal: %s", err.Error())
+ log.Errorf("Error while sending signal %v : %s", sig, err.Error())
}
}
}()
// 1- if no confFile set, use setting from gdb command file is option
// --command/-x is set
if confFile == "" && gdbCmdFile != "" {
- logEarly("Try extract config from gdbCmdFile: %s", gdbCmdFile)
+ log.Infof("Try extract config from gdbCmdFile: %s", gdbCmdFile)
confFile, err = extractEnvFromCmdFile(gdbCmdFile)
if confFile != "" {
defer os.Remove(confFile)
}
if err != nil {
- return envMap, confFile, fmt.Errorf(err.Error())
+ log.Infof("Extraction from gdbCmdFile failed: %v", err.Error())
}
}
// 2- search xds-gdb.env file in various locations
xdsEnvFile := "xds-gdb.env"
for _, d := range []string{
path.Join(curDir),
- path.Join(curDir, "..", ".."),
- path.Join(curDir, "../../target"),
- path.Join(u.HomeDir, ".xds"),
+ path.Join(curDir, ".."),
+ path.Join(curDir, "target"),
+ path.Join(u.HomeDir, ".config", "xds"),
} {
confFile = path.Join(d, xdsEnvFile)
- logEarly("Search config in %s", confFile)
+ log.Infof("Search config in %s", confFile)
if common.Exists(confFile) {
break
}
}
if confFile == "" {
+ log.Infof("NO valid conf file found!")
return envMap, "", nil
}
if envMap, err = godotenv.Read(confFile); err != nil {
return envMap, confFile, fmt.Errorf("Error reading env config file " + confFile)
}
+
return envMap, confFile, nil
}
return envFileName, nil
}
-
-func logEarly(format string, a ...interface{}) {
- earlyLog = append(earlyLog, fmt.Sprintf(format, a...))
-}
Code Review / src / xds / xds-gdb.git / blobdiff