Skip to content

Commit bfb406c

Browse files
CatsDeservePetsCatsDeservePets
committed
[WIP] Improve logging
1 parent a949d4a commit bfb406c

File tree

18 files changed

+178
-115
lines changed

18 files changed

+178
-115
lines changed

‎app.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"fmt"
77
"io"
88
"io/fs"
9-
"log"
109
"os"
1110
"os/exec"
1211
"os/signal"
@@ -79,23 +78,23 @@ func (app *app) quit() {
7978

8079
if gOpts.history {
8180
if err := app.writeHistory(); err != nil {
82-
log.Printf("writing history file: %s", err)
81+
errorf("writing history file: %s", err)
8382
}
8483
}
8584
if !gSingleMode {
8685
if err := remote(fmt.Sprintf("drop %d", gClientID)); err != nil {
87-
log.Printf("dropping connection: %s", err)
86+
errorf("dropping connection: %s", err)
8887
}
8988
if gOpts.autoquit {
9089
if err := remote("quit"); err != nil {
91-
log.Printf("auto quitting server: %s", err)
90+
errorf("auto quitting server: %s", err)
9291
}
9392
}
9493
}
9594
}
9695

9796
func (app *app) readFile(path string) {
98-
log.Printf("reading file: %s", path)
97+
infof("reading file: %s", path)
9998

10099
f, err := os.Open(path)
101100
if err != nil {
@@ -150,7 +149,7 @@ func loadFiles() (clipboard clipboard, err error) {
150149
return
151150
}
152151

153-
log.Printf("loading files: %v", clipboard.paths)
152+
infof("loading files: %v", clipboard.paths)
154153

155154
return
156155
}
@@ -166,7 +165,7 @@ func saveFiles(clipboard clipboard) error {
166165
}
167166
defer files.Close()
168167

169-
log.Printf("saving files: %v", clipboard.paths)
168+
infof("saving files: %v", clipboard.paths)
170169

171170
if clipboard.mode == clipboardCopy {
172171
fmt.Fprintln(files, "copy")
@@ -264,7 +263,7 @@ func (app *app) loop() {
264263
if _, err := os.Stat(gConfigPath); !os.IsNotExist(err) {
265264
app.readFile(gConfigPath)
266265
} else {
267-
log.Printf("config file does not exist: %s", err)
266+
errorf("config file does not exist: %s", err)
268267
}
269268
} else {
270269
for _, path := range gConfigPaths {
@@ -288,7 +287,7 @@ func (app *app) loop() {
288287

289288
wd, err := os.Getwd()
290289
if err != nil {
291-
log.Printf("getting current directory: %s", err)
290+
errorf("getting current directory: %s", err)
292291
}
293292

294293
app.nav.getDirs(wd)
@@ -330,7 +329,8 @@ func (app *app) loop() {
330329

331330
app.nav.previewChan <- ""
332331

333-
log.Print("bye!")
332+
pid := os.Getpid()
333+
infof("*************** closing client, PID: %d ***************", pid)
334334

335335
return
336336
case n := <-app.nav.copyJobsChan:
@@ -515,7 +515,7 @@ func (app *app) runCmdSync(cmd *exec.Cmd, pauseAfter bool) {
515515
app.nav.previewChan <- ""
516516

517517
if err := app.ui.suspend(); err != nil {
518-
log.Printf("suspend: %s", err)
518+
errorf("suspend: %s", err)
519519
}
520520
defer func() {
521521
if err := app.ui.resume(); err != nil {
@@ -594,15 +594,15 @@ func (app *app) runShell(s string, args []string, prefix string) {
594594
// the output has been fully read or not.
595595
inReader, inWriter, err := os.Pipe()
596596
if err != nil {
597-
log.Printf("creating input pipe: %s", err)
597+
errorf("creating input pipe: %s", err)
598598
return
599599
}
600600
cmd.Stdin = inReader
601601
app.cmdIn = inWriter
602602

603603
outReader, outWriter, err = os.Pipe()
604604
if err != nil {
605-
log.Printf("creating output pipe: %s", err)
605+
errorf("creating output pipe: %s", err)
606606
return
607607
}
608608
cmd.Stdout = outWriter
@@ -628,7 +628,7 @@ func (app *app) runShell(s string, args []string, prefix string) {
628628
b, err := reader.ReadByte()
629629
if err != nil {
630630
if !errors.Is(err, io.EOF) && !errors.Is(err, fs.ErrClosed) {
631-
log.Printf("reading command output: %s", err)
631+
errorf("reading command output: %s", err)
632632
}
633633
break
634634
}
@@ -646,7 +646,7 @@ func (app *app) runShell(s string, args []string, prefix string) {
646646

647647
go func() {
648648
if err := cmd.Wait(); err != nil {
649-
log.Printf("running shell: %s", err)
649+
errorf("running shell: %s", err)
650650
}
651651
inReader.Close()
652652
inWriter.Close()
@@ -660,7 +660,7 @@ func (app *app) runShell(s string, args []string, prefix string) {
660660
case "&":
661661
go func() {
662662
if err := cmd.Wait(); err != nil {
663-
log.Printf("running shell: %s", err)
663+
errorf("running shell: %s", err)
664664
}
665665
app.ui.exprChan <- &callExpr{"load", nil, 1}
666666
}()

‎client.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ func run() {
3737
log.SetOutput(io.Discard)
3838
}
3939

40-
log.Print("hi!")
40+
io.WriteString(log.Writer(), "\n")
41+
infof("*************** starting client, PID: %d ***************", os.Getpid())
4142

4243
var screen tcell.Screen
4344
var err error
@@ -89,28 +90,28 @@ func run() {
8990
func writeLastDir(filename string, lastDir string) {
9091
f, err := os.Create(filename)
9192
if err != nil {
92-
log.Printf("opening last dir file: %s", err)
93+
errorf("opening last dir file: %s", err)
9394
return
9495
}
9596
defer f.Close()
9697

9798
_, err = f.WriteString(lastDir)
9899
if err != nil {
99-
log.Printf("writing last dir file: %s", err)
100+
errorf("writing last dir file: %s", err)
100101
}
101102
}
102103

103104
func writeSelection(filename string, selection []string) {
104105
f, err := os.Create(filename)
105106
if err != nil {
106-
log.Printf("opening selection file: %s", err)
107+
errorf("opening selection file: %s", err)
107108
return
108109
}
109110
defer f.Close()
110111

111112
_, err = f.WriteString(strings.Join(selection, "\n"))
112113
if err != nil {
113-
log.Printf("writing selection file: %s", err)
114+
errorf("writing selection file: %s", err)
114115
}
115116
}
116117

@@ -122,7 +123,7 @@ func readExpr() <-chan expr {
122123

123124
c, err := net.Dial(gSocketProt, gSocketPath)
124125
for err != nil {
125-
log.Printf("connecting server: %s", err)
126+
errorf("connecting server: %s", err)
126127
time.Sleep(duration)
127128
duration *= 2
128129
c, err = net.Dial(gSocketProt, gSocketPath)
@@ -135,7 +136,7 @@ func readExpr() <-chan expr {
135136

136137
s := bufio.NewScanner(c)
137138
for s.Scan() {
138-
log.Printf("recv: %s", s.Text())
139+
debugf("recv: %s", s.Text())
139140

140141
// `query` has to be handled outside of the main thread, which is
141142
// blocked when running a synchronous shell command ("$" or "!").

‎colors.go‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"log"
65
"os"
76
"path/filepath"
87
"strconv"
@@ -184,7 +183,7 @@ loop:
184183
case "38":
185184
color, offset, err := parseColor(toks[i+1:])
186185
if err != nil {
187-
log.Printf("error processing ansi code 38: %s", err)
186+
errorf("error processing ansi code 38: %s", err)
188187
break loop
189188
}
190189
st = st.Foreground(color)
@@ -198,40 +197,40 @@ loop:
198197
case "48":
199198
color, offset, err := parseColor(toks[i+1:])
200199
if err != nil {
201-
log.Printf("error processing ansi code 48: %s", err)
200+
errorf("error processing ansi code 48: %s", err)
202201
break loop
203202
}
204203
st = st.Background(color)
205204
i += offset
206205
case "58":
207206
color, offset, err := parseColor(toks[i+1:])
208207
if err != nil {
209-
log.Printf("error processing ansi code 58: %s", err)
208+
errorf("error processing ansi code 58: %s", err)
210209
break loop
211210
}
212211
st = st.Underline(color)
213212
i += offset
214213
default:
215-
log.Printf("unknown ansi code: %s", toks[i])
214+
errorf("unknown ansi code: %s", toks[i])
216215
}
217216
}
218217

219218
return st
220219
}
221220

222221
func (sm styleMap) parseFile(path string) {
223-
log.Printf("reading file: %s", path)
222+
infof("reading file: %s", path)
224223

225224
f, err := os.Open(path)
226225
if err != nil {
227-
log.Printf("opening colors file: %s", err)
226+
errorf("opening colors file: %s", err)
228227
return
229228
}
230229
defer f.Close()
231230

232231
pairs, err := readPairs(f)
233232
if err != nil {
234-
log.Printf("reading colors file: %s", err)
233+
errorf("reading colors file: %s", err)
235234
return
236235
}
237236

@@ -250,7 +249,7 @@ func (sm *styleMap) parseGNU(env string) {
250249
pair := strings.Split(entry, "=")
251250

252251
if len(pair) != 2 {
253-
log.Printf("invalid $LS_COLORS entry: %s", entry)
252+
errorf("invalid $LS_COLORS entry: %s", entry)
254253
return
255254
}
256255

@@ -277,7 +276,7 @@ func (sm *styleMap) parsePair(pair []string) {
277276
// This function parses $LSCOLORS environment variable.
278277
func (sm styleMap) parseBSD(env string) {
279278
if len(env) != 22 {
280-
log.Printf("invalid $LSCOLORS variable: %s", env)
279+
errorf("invalid $LSCOLORS variable: %s", env)
281280
return
282281
}
283282

@@ -294,7 +293,7 @@ func (sm styleMap) parseBSD(env string) {
294293
case 'a' <= r1 && r1 <= 'h':
295294
st = st.Foreground(tcell.PaletteColor(int(r1 - 'a')))
296295
default:
297-
log.Printf("invalid $LSCOLORS entry: %c", r1)
296+
errorf("invalid $LSCOLORS entry: %c", r1)
298297
return tcell.StyleDefault
299298
}
300299

@@ -304,7 +303,7 @@ func (sm styleMap) parseBSD(env string) {
304303
case 'a' <= r2 && r2 <= 'h':
305304
st = st.Background(tcell.PaletteColor(int(r2 - 'a')))
306305
default:
307-
log.Printf("invalid $LSCOLORS entry: %c", r2)
306+
errorf("invalid $LSCOLORS entry: %c", r2)
308307
return tcell.StyleDefault
309308
}
310309

‎complete.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"log"
54
"maps"
65
"os"
76
"path/filepath"
@@ -248,7 +247,7 @@ func matchFile(s string, dirOnly bool, escape func(string) string, unescape func
248247
}
249248
files, err := os.ReadDir(d)
250249
if err != nil {
251-
log.Printf("reading directory: %s", err)
250+
errorf("reading directory: %s", err)
252251
result = s
253252
return
254253
}
@@ -316,7 +315,7 @@ func matchExec(s string) (matches []compMatch, result string) {
316315
files, err := os.ReadDir(p)
317316
if err != nil {
318317
if !os.IsNotExist(err) {
319-
log.Printf("reading path: %s", err)
318+
errorf("reading path: %s", err)
320319
}
321320
continue
322321
}
@@ -328,7 +327,7 @@ func matchExec(s string) (matches []compMatch, result string) {
328327

329328
finfo, err := f.Info()
330329
if err != nil {
331-
log.Printf("getting file information: %s", err)
330+
errorf("getting file information: %s", err)
332331
continue
333332
}
334333

@@ -346,7 +345,7 @@ func matchExec(s string) (matches []compMatch, result string) {
346345
func matchSearch(s string) (matches []compMatch, result string) {
347346
files, err := os.ReadDir(".")
348347
if err != nil {
349-
log.Printf("reading directory: %s", err)
348+
errorf("reading directory: %s", err)
350349
result = s
351350
return
352351
}

‎df_openbsd.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package main
22

33
import (
4-
"log"
5-
64
"golang.org/x/sys/unix"
75
)
86

97
func diskFree(wd string) string {
108
var stat unix.Statfs_t
119

1210
if err := unix.Statfs(wd, &stat); err != nil {
13-
log.Printf("diskfree: %s", err)
11+
errorf("diskfree: %s", err)
1412
return ""
1513
}
1614

‎df_statfs.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
package main
44

55
import (
6-
"log"
7-
86
"golang.org/x/sys/unix"
97
)
108

119
func diskFree(wd string) string {
1210
var stat unix.Statfs_t
1311

1412
if err := unix.Statfs(wd, &stat); err != nil {
15-
log.Printf("diskfree: %s", err)
13+
errorf("diskfree: %s", err)
1614
return ""
1715
}
1816

‎df_statvfs.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
package main
44

55
import (
6-
"log"
7-
86
"golang.org/x/sys/unix"
97
)
108

119
func diskFree(wd string) string {
1210
var stat unix.Statvfs_t
1311

1412
if err := unix.Statvfs(wd, &stat); err != nil {
15-
log.Printf("diskfree: %s", err)
13+
errorf("diskfree: %s", err)
1614
return ""
1715
}
1816

0 commit comments

Comments
 (0)