golint cleanups.

This commit is contained in:
Kyle Isom 2017-11-16 08:32:05 -08:00
parent d083a39a7d
commit cb16cfa183
6 changed files with 19 additions and 10 deletions

View File

@ -16,7 +16,7 @@ import (
"testing" "testing"
) )
// NoDebug, if set to true, will cause all asserts to be ignored. // NoDebug can be set to true to cause all asserts to be ignored.
var NoDebug bool var NoDebug bool
func die(what string, a ...string) { func die(what string, a ...string) {

View File

@ -14,9 +14,9 @@ var (
format = "2006-01-02 15:04" // Format that will be used for times. format = "2006-01-02 15:04" // Format that will be used for times.
outFormat = format + " MST" // Output format. outFormat = format + " MST" // Output format.
tz = "Local" // String descriptor for timezone. tz = "Local" // String descriptor for timezone.
fromLoc *time.Location = time.Local // Go time.Location for the named timezone. fromLoc = time.Local // Go time.Location for the named timezone.
fromUnix bool // Input times are Unix timestamps. fromUnix bool // Input times are Unix timestamps.
toLoc *time.Location = time.UTC // Go time.Location for output timezone. toLoc = time.UTC // Go time.Location for output timezone.
) )
func usage(w io.Writer) { func usage(w io.Writer) {
@ -84,7 +84,7 @@ PST8PDT time zone):
2016-06-14 21:30 PDT = 2016-06-15 04:30 UTC 2016-06-14 21:30 PDT = 2016-06-15 04:30 UTC
+ Converting a local EST timestamp to UTC (on a machine set to + Converting a local EST timestamp to UTC (on a machine set to
PST8PDT): PST8PDT):
$ utc -z EST '2016-06-14 21:30' $ utc -z EST '2016-06-14 21:30'
2016-06-14 21:30 EST = 2016-06-15 02:30 UTC 2016-06-14 21:30 EST = 2016-06-15 02:30 UTC
+ Converting timestamps in the form '14-06-2016 3:04PM': + Converting timestamps in the form '14-06-2016 3:04PM':
$ utc -f '02-01-2006 3:04PM' '14-06-2016 9:30PM' $ utc -f '02-01-2006 3:04PM' '14-06-2016 9:30PM'
@ -101,7 +101,7 @@ PST8PDT time zone):
$ utc -u -z EST '2016-06-14 21:30' $ utc -u -z EST '2016-06-14 21:30'
2016-06-14 21:30 UTC = 2016-06-14 16:30 EST 2016-06-14 21:30 UTC = 2016-06-14 16:30 EST
+ Using a different output format: + Using a different output format:
$ utc -o '2006-01-02T15:03:04-0700' '2016-06-14 21:30' $ utc -o '2006-01-02T15:03:04-0700' '2016-06-14 21:30'
2016-06-14T21:09:30-0700 = 2016-06-15T04:04:30+0000 2016-06-14T21:09:30-0700 = 2016-06-15T04:04:30+0000
+ Converting a Unix timestamp to a UTC time: + Converting a Unix timestamp to a UTC time:
$ utc -t 1466052938 $ utc -t 1466052938

View File

@ -8,10 +8,17 @@ type File struct {
*LogWriter *LogWriter
} }
func (fl *File) Close() { // Close calls close on the underlying log files.
fl.fo.Close() func (fl *File) Close() error {
if fl.fo != nil {
if err := fl.fo.Close(); err != nil {
return err
}
fl.fo = nil
}
if fl.fe != nil { if fl.fe != nil {
fl.fe.Close() return fl.fe.Close()
} }
} }

View File

@ -29,6 +29,7 @@ const (
LevelFatal LevelFatal
) )
// DefaultLevel is the default logging level when none is provided.
const DefaultLevel = LevelInfo const DefaultLevel = LevelInfo
// Cheap integer to fixed-width decimal ASCII. Give a negative width // Cheap integer to fixed-width decimal ASCII. Give a negative width

View File

@ -228,7 +228,7 @@ func (lw *LogWriter) Fatal(actor, event string, attrs map[string]string) {
os.Exit(1) os.Exit(1)
} }
// Fatal emits a message indicating that the system is in an unsuable // FatalCode emits a message indicating that the system is in an unsuable
// state, and cannot continue to run. The program will exit with the // state, and cannot continue to run. The program will exit with the
// exit code speicfied in the exitcode argument. // exit code speicfied in the exitcode argument.
// //
@ -244,7 +244,7 @@ func (lw *LogWriter) FatalCode(exitcode int, actor, event string, attrs map[stri
os.Exit(exitcode) os.Exit(exitcode)
} }
// Fatal emits a message indicating that the system is in an unsuable // FatalNoDie emits a message indicating that the system is in an unsuable
// state, and cannot continue to run. The program will not exit; it is // state, and cannot continue to run. The program will not exit; it is
// assumed that the caller has some final clean up to perform. // assumed that the caller has some final clean up to perform.
// //

View File

@ -23,6 +23,7 @@ func (t *Tee) Write(p []byte) (int, error) {
return n, nil return n, nil
} }
// Close calls Close on the underlying file.
func (t *Tee) Close() error { func (t *Tee) Close() error {
return t.f.Close() return t.f.Close()
} }