author | Alberto Bertogli
<albertito@blitiri.com.ar> 2017-08-13 18:30:58 UTC |
committer | Alberto Bertogli
<albertito@blitiri.com.ar> 2017-08-13 18:54:26 UTC |
parent | 5024aaaf7fb9e0eb99bf9419c5b6ec226970f5c9 |
LICENSE | +219 | -0 |
README.md | +42 | -0 |
log.go | +46 | -8 |
diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6f1ab52 --- /dev/null +++ b/LICENSE @@ -0,0 +1,219 @@ + +Copyright 2016 + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +-------------------------------------------------------------------------- + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..361ea8a --- /dev/null +++ b/README.md @@ -0,0 +1,42 @@ + +# blitiri.com.ar/go/log + +[![GoDoc](https://godoc.org/blitiri.com.ar/go/log?status.svg)](https://godoc.org/blitiri.com.ar/go/log) + +[log](https://godoc.org/blitiri.com.ar/go/log) is a Go package implementing a +simple logger. + +It implements an API somewhat similar to [glog](github.com/google/glog), with +a focus towards simplicity and integration with standard tools such as +systemd. + + +## Examples + +```go +log.Init() // only needed once. + +log.Debugf("debugging information: %v", x) +log.Infof("something normal happened") +log.Errorf("something bad happened") +log.Fatalf("tragic") + +if log.V(3) { // only entered if -v was >= 3. + expensiveDebugging() +} +``` + + +## Status + +The API should be considered stable. + +Branch v1 will only have backwards-compatible changes made to it. +There are no plans for v2 at the moment. + + +## Contact + +If you have any questions, comments or patches please send them to +albertito@blitiri.com.ar. + diff --git a/log.go b/log.go index 7981aab..8632aad 100644 --- a/log.go +++ b/log.go @@ -1,13 +1,26 @@ // Package log implements a simple logger. // // It implements an API somewhat similar to "github.com/google/glog" with a -// focus towards logging to stderr, which is useful for systemd-based -// environments. +// focus towards simplicity and integration with standard tools such as +// systemd. // // There are command line flags (defined using the flag package) to control // the behaviour of the default logger. By default, it will write to stderr // without timestamps; this is suitable for systemd (or equivalent) logging. -package log +// +// Command-line flags: +// +// -alsologtostderr +// also log to stderr, in addition to the file +// -logfile string +// file to log to (enables logtime) +// -logtime +// include the time when writing the log to stderr +// -logtosyslog string +// log to syslog, with the given tag +// -v int +// verbosity level (1 = debug) +package log // import "blitiri.com.ar/go/log" import ( "flag" @@ -25,7 +38,7 @@ import ( // Flags that control the default logging. var ( - vLevel = flag.Int("v", 0, "Verbosity level (1 = debug)") + vLevel = flag.Int("v", 0, "verbosity level (1 = debug)") logFile = flag.String("logfile", "", "file to log to (enables logtime)") @@ -40,9 +53,10 @@ var ( "also log to stderr, in addition to the file") ) -// Logging levels. +// Type of a logging level, to prevent confusion. type Level int +// Standard logging levels. const ( Fatal = Level(-2) Error = Level(-1) @@ -57,7 +71,7 @@ var levelToLetter = map[Level]string{ Debug: ".", } -// A Logger represents a logging object that writes logs to the given writer. +// A Logger represents a logging object that writes logs to a writer. type Logger struct { level Level logTime bool @@ -68,6 +82,7 @@ type Logger struct { sync.Mutex } +// New creates a new Logger, which writes logs to w. func New(w io.WriteCloser) *Logger { return &Logger{ w: w, @@ -77,6 +92,7 @@ func New(w io.WriteCloser) *Logger { } } +// NewFile creates a new Logger, which writes logs to the given file. func NewFile(path string) (*Logger, error) { f, err := os.OpenFile(path, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644) if err != nil { @@ -88,6 +104,8 @@ func NewFile(path string) (*Logger, error) { return l, nil } +// NewSyslog creates a new Logger, which writes logs to syslog, using the +// given priority and tag. func NewSyslog(priority syslog.Priority, tag string) (*Logger, error) { w, err := syslog.New(priority, tag) if err != nil { @@ -99,14 +117,22 @@ func NewSyslog(priority syslog.Priority, tag string) (*Logger, error) { return l, nil } +// Close the writer behind the logger. func (l *Logger) Close() { l.w.Close() } +// V returns true if the logger's level is >= the one given, false otherwise. +// It can be used to decide whether to use or gather debugging information +// only at a certain level, to avoid computing it needlessly. func (l *Logger) V(level Level) bool { return level <= l.level } +// Log the message into the logger, at the given level. This is low-level and +// should rarely be needed, but it's available to allow the caller to have +// more complex logic if needed. skip is the number of frames to skip when +// computing the file name and line number. func (l *Logger) Log(level Level, skip int, format string, a ...interface{}) { if !l.V(level) { return @@ -147,19 +173,25 @@ func (l *Logger) Log(level Level, skip int, format string, a ...interface{}) { l.Unlock() } +// Debugf logs information at a Debug level. func (l *Logger) Debugf(format string, a ...interface{}) { l.Log(Debug, 1, format, a...) } +// Infof logs information at a Info level. func (l *Logger) Infof(format string, a ...interface{}) { l.Log(Info, 1, format, a...) } +// Errorf logs information at an Error level. It also returns an error +// constructed with the given message, in case it's useful for the caller. func (l *Logger) Errorf(format string, a ...interface{}) error { l.Log(Error, 1, format, a...) return fmt.Errorf(format, a...) } +// Fatalf logs information at a Fatal level, and then exits the program with a +// non-0 exit code. func (l *Logger) Fatalf(format string, a ...interface{}) { l.Log(-2, 1, format, a...) // TODO: Log traceback? @@ -174,9 +206,9 @@ var Default = &Logger{ logTime: false, } -// Init the default logger, based on the command-line flags. -// Must be called after flag.Parse(). +// Initialize the default logger, based on the command-line flags. func Init() { + flag.Parse() var err error if *logToSyslog != "" { @@ -201,26 +233,32 @@ func Init() { Default.logTime = *logTime } +// V is a convenient wrapper to Default.V. func V(level Level) bool { return Default.V(level) } +// Log is a convenient wrapper to Default.Log. func Log(level Level, skip int, format string, a ...interface{}) { Default.Log(level, skip, format, a...) } +// Debugf is a convenient wrapper to Default.Debugf. func Debugf(format string, a ...interface{}) { Default.Debugf(format, a...) } +// Infof is a convenient wrapper to Default.Infof. func Infof(format string, a ...interface{}) { Default.Infof(format, a...) } +// Errorf is a convenient wrapper to Default.Errorf. func Errorf(format string, a ...interface{}) error { return Default.Errorf(format, a...) } +// Fatalf is a convenient wrapper to Default.Fatalf. func Fatalf(format string, a ...interface{}) { Default.Fatalf(format, a...) }