Skip to content

Commit

Permalink
Merge pull request #20 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 1.5.1
  • Loading branch information
andyone authored Dec 28, 2018
2 parents 0c59457 + 9f42ff0 commit 9fb0934
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
sudo: required

language: go

go:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################

# This Makefile generated by GoMakeGen 0.8.0 using next command:
# This Makefile generated by GoMakeGen 0.8.1 using next command:
# gomakegen .

################################################################################
Expand All @@ -23,7 +23,7 @@ uninstall: ## Uninstall binaries

deps: ## Download dependencies
git config --global http.https://pkg.re.followRedirects true
go get -d -v pkg.re/essentialkaos/ek.v9
go get -d -v pkg.re/essentialkaos/ek.v10

fmt: ## Format source code with gofmt
find . -name "*.go" -exec gofmt -s -w {} \;
Expand Down
5 changes: 4 additions & 1 deletion common/deadline.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Simple utility for controlling application working time
Name: deadline
Version: 1.5.0
Version: 1.5.1
Release: 0%{?dist}
Group: Applications/System
License: EKOL
Expand Down Expand Up @@ -57,6 +57,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Thu Dec 13 2018 Anton Novojilov <[email protected]> - 1.5.1-0
- Code refactoring

* Fri Nov 02 2018 Anton Novojilov <[email protected]> - 1.5.0-0
- Fixed bug with showing version info
- Code refactoring
Expand Down
18 changes: 8 additions & 10 deletions deadline.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ import (
"syscall"
"time"

"pkg.re/essentialkaos/ek.v9/env"
"pkg.re/essentialkaos/ek.v9/fsutil"
"pkg.re/essentialkaos/ek.v9/strutil"
"pkg.re/essentialkaos/ek.v9/system/process"
"pkg.re/essentialkaos/ek.v9/timeutil"
"pkg.re/essentialkaos/ek.v9/usage"
"pkg.re/essentialkaos/ek.v10/env"
"pkg.re/essentialkaos/ek.v10/fsutil"
"pkg.re/essentialkaos/ek.v10/strutil"
"pkg.re/essentialkaos/ek.v10/system/process"
"pkg.re/essentialkaos/ek.v10/timeutil"
"pkg.re/essentialkaos/ek.v10/usage"
)

// ////////////////////////////////////////////////////////////////////////////////// //

const (
APP = "deadline"
VER = "1.5.0"
VER = "1.5.1"
DESC = "Simple utility for controlling application working time"
)

Expand Down Expand Up @@ -144,9 +144,7 @@ func monitor(sigInfo SignalInfo) {
var elapsed int64
var signalSent bool

for {
time.Sleep(time.Second)

for range time.NewTicker(time.Second).C {
elapsed++

if elapsed >= sigInfo.Wait && !signalSent {
Expand Down

0 comments on commit 9fb0934

Please sign in to comment.