From 34db8a6edfc8e86c0d994036a2ea245d624a8558 Mon Sep 17 00:00:00 2001 From: Nino Khodabandeh Date: Tue, 26 Apr 2016 15:47:46 -0700 Subject: [PATCH] Updates licensing and all the header comments --- CHANGES.md | 5 +++-- LICENSE.txt | 38 ++++++++++++++++++-------------------- cmd/gotail/gotail.go | 4 +++- tail.go | 1 + tail_test.go | 1 + util/util.go | 3 ++- watch/inotify.go | 1 + watch/inotify_tracker.go | 1 + watch/polling.go | 1 + watch/watch.go | 1 + 10 files changed, 32 insertions(+), 24 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 56aedb6..422790c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,15 +1,16 @@ -# API current (gopkg.in/ActiveState/tail) +# API v1 (gopkg.in/hpcloud/tail.v1) ## April, 2016 * Migrated to godep, as depman is not longer supported * Introduced golang vendoring feature +* Fixed issue [#57](https://github.com/hpcloud/tail/issues/57) related to reopen deleted file ## July, 2015 * Fix inotify watcher leak; remove `Cleanup` (#51) -# API v0 (gopkg.in/ActiveState/tail.v0) +# API v0 (gopkg.in/hpcloud/tail.v0) ## June, 2015 diff --git a/LICENSE.txt b/LICENSE.txt index ea07fde..818d802 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,23 +1,21 @@ -# This is the MIT license +# The MIT License (MIT) -# Copyright (c) 2013 ActiveState Software Inc. All rights reserved. +# © Copyright 2015 Hewlett Packard Enterprise Development LP +Copyright (c) 2014 ActiveState -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/cmd/gotail/gotail.go b/cmd/gotail/gotail.go index c63b582..3da55f2 100644 --- a/cmd/gotail/gotail.go +++ b/cmd/gotail/gotail.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. package main @@ -5,8 +6,9 @@ package main import ( "flag" "fmt" - "github.com/hpcloud/tail" "os" + + "github.com/hpcloud/tail" ) func args2config() (tail.Config, int64) { diff --git a/tail.go b/tail.go index 6f77661..2d252d6 100644 --- a/tail.go +++ b/tail.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. package tail diff --git a/tail_test.go b/tail_test.go index 6d602a4..92cdd5d 100644 --- a/tail_test.go +++ b/tail_test.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. // TODO: diff --git a/util/util.go b/util/util.go index f58b3ee..54151fe 100644 --- a/util/util.go +++ b/util/util.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. package util @@ -17,7 +18,7 @@ var LOGGER = &Logger{log.New(os.Stderr, "", log.LstdFlags)} // fatal is like panic except it displays only the current goroutine's stack. func Fatal(format string, v ...interface{}) { - // https://github.com/ActiveState/log/blob/master/log.go#L45 + // https://github.com/hpcloud/log/blob/master/log.go#L45 LOGGER.Output(2, fmt.Sprintf("FATAL -- "+format, v...)+"\n"+string(debug.Stack())) os.Exit(1) } diff --git a/watch/inotify.go b/watch/inotify.go index d86e724..4478f1e 100644 --- a/watch/inotify.go +++ b/watch/inotify.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. package watch diff --git a/watch/inotify_tracker.go b/watch/inotify_tracker.go index 2353ba3..03be427 100644 --- a/watch/inotify_tracker.go +++ b/watch/inotify_tracker.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. package watch diff --git a/watch/polling.go b/watch/polling.go index f595992..49491f2 100644 --- a/watch/polling.go +++ b/watch/polling.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. package watch diff --git a/watch/watch.go b/watch/watch.go index 05baea1..2e1783e 100644 --- a/watch/watch.go +++ b/watch/watch.go @@ -1,3 +1,4 @@ +// Copyright (c) 2015 HPE Software Inc. All rights reserved. // Copyright (c) 2013 ActiveState Software Inc. All rights reserved. package watch