|
@@ -231,7 +231,6 @@ func (d *Door) detect() {
|
|
}
|
|
}
|
|
|
|
|
|
// get screen size
|
|
// get screen size
|
|
- var err error
|
|
|
|
|
|
|
|
pos := strings.LastIndex(results, "\x1b")
|
|
pos := strings.LastIndex(results, "\x1b")
|
|
if pos != -1 {
|
|
if pos != -1 {
|
|
@@ -242,7 +241,7 @@ func (d *Door) detect() {
|
|
pos = strings.Index(results, ";")
|
|
pos = strings.Index(results, ";")
|
|
if pos != -1 {
|
|
if pos != -1 {
|
|
height := results[:pos]
|
|
height := results[:pos]
|
|
- Height, err = strconv.Atoi(height)
|
|
|
|
|
|
+ Height, _ = strconv.Atoi(height)
|
|
pos++
|
|
pos++
|
|
results = results[pos:]
|
|
results = results[pos:]
|
|
|
|
|
|
@@ -250,8 +249,8 @@ func (d *Door) detect() {
|
|
if pos != -1 {
|
|
if pos != -1 {
|
|
width := results[:pos]
|
|
width := results[:pos]
|
|
|
|
|
|
- Width, err = strconv.Atoi(width)
|
|
|
|
- log.Printf("Width: %s, %d, %v\n", results, Width, err)
|
|
|
|
|
|
+ Width, _ = strconv.Atoi(width)
|
|
|
|
+ // log.Printf("Width: %s, %d, %v\n", results, Width, err)
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
Height = 0
|
|
Height = 0
|
|
@@ -281,6 +280,8 @@ func (d *Door) Init(doorname string) {
|
|
}
|
|
}
|
|
|
|
|
|
d.ReadDropfile(dropfile)
|
|
d.ReadDropfile(dropfile)
|
|
|
|
+
|
|
|
|
+ // doorname - node #?
|
|
logfilename := fmt.Sprintf("%s-%d.log", doorname, d.Config.Node)
|
|
logfilename := fmt.Sprintf("%s-%d.log", doorname, d.Config.Node)
|
|
logf, err := os.OpenFile(logfilename, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0666)
|
|
logf, err := os.OpenFile(logfilename, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0666)
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -288,6 +289,9 @@ func (d *Door) Init(doorname string) {
|
|
}
|
|
}
|
|
|
|
|
|
log.SetOutput(logf)
|
|
log.SetOutput(logf)
|
|
|
|
+ log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
|
|
|
|
+ // log.SetPrefix(doorname + " ")
|
|
|
|
+
|
|
//= log.New(logf, fmt.Sprintf("%s-%d", doorname, d.Config.Node), log.Ldate|log.Ltime|log.Lshortfile)
|
|
//= log.New(logf, fmt.Sprintf("%s-%d", doorname, d.Config.Node), log.Ldate|log.Ltime|log.Lshortfile)
|
|
log.Printf("Loading dropfile %s\n", dropfile)
|
|
log.Printf("Loading dropfile %s\n", dropfile)
|
|
|
|
|