Skip to content

Commit

Permalink
Merge pull request #246 from ondrej-fabry/master
Browse files Browse the repository at this point in the history
Release v1.1
  • Loading branch information
VladoLavor authored Feb 7, 2018
2 parents d27ff7d + 797068b commit 39925ec
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# Release v1.0.8 (2018-1-22)
# Release v1.1 (2018-02-07)

## Dependencies
* Migrated from glide to dep

## Prometheus
* Introduced Prometheus plugin with examples

# Release v1.0.8 (2018-01-22)

## Kafka
* Added support for Kafka TLS.
Expand Down Expand Up @@ -86,7 +94,7 @@ Added TLS support
* new field `group-id` can be added to kafka.conf. This value is used as a Group ID in order to set it
manually. In case the value is not provided, the service label is used instead (just like before).

# Release v1.0.4 (2017-9-25)
# Release v1.0.4 (2017-09-25)

## Documentation
* Improved documentation of public APIs (comments)
Expand Down
9 changes: 9 additions & 0 deletions logging/measure/stopwatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ func GetTimeLog(n interface{}, s *Stopwatch) *TimeLog {
return s.timeLog(n)
}

// TimeLog returns a pointer to the TimeLog object related to the provided name (derived from the <n> parameter).
// If stopwatch instance is nil, returns nil
func (st *Stopwatch) TimeLog(n interface{}) *TimeLog {
if st == nil {
return nil
}
return st.timeLog(n)
}

// looks over stopwatch timeTable map in order to find a TimeLog object for provided name. If the object does not exist,
// it is created anew, stored in the map and returned
func (st *Stopwatch) timeLog(n interface{}) *TimeLog {
Expand Down

0 comments on commit 39925ec

Please sign in to comment.