github/nohang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

files relocation

Browse Source
This commit is contained in:
Alexey Avramov 2019-09-29 22:53:51 +09:00
parent c12d23535a
commit f70ac6f04b
15 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -21,7 +21,7 @@ script:
- nohang -v - nohang -v
- nohang -cc /etc/nohang/nohang.conf - nohang -cc /etc/nohang/nohang.conf
- nohang -cc test.conf - nohang -cc nohang/test.conf
- nohang -p - nohang -p
- sudo nohang -p - sudo nohang -p
@ -29,7 +29,7 @@ script:
- sudo bash -c "nohang & tail /dev/zero & sleep 20 && pkill python3" - sudo bash -c "nohang & tail /dev/zero & sleep 20 && pkill python3"
- /bin/sleep 60 & - /bin/sleep 60 &
- sudo bash -c "nohang -c test.conf & tail /dev/zero & sleep 30 && pkill python3" - sudo sh -c "timeout 30 nohang -c nohang/test.conf & tail /dev/zero"
- sudo cat /var/log/nohang/nohang.log - sudo cat /var/log/nohang/nohang.log
- sudo make uninstall - sudo make uninstall

58
Makefile
View File

@ -11,29 +11,31 @@ all:
install: install:
install -d $(DESTDIR)$(BINDIR) install -d $(DESTDIR)$(BINDIR)
install -m0755 nohang $(DESTDIR)$(BINDIR)/nohang install -m0755 nohang/nohang $(DESTDIR)$(BINDIR)/nohang
install -m0755 oom-sort $(DESTDIR)$(BINDIR)/oom-sort install -m0755 tools/oom-sort $(DESTDIR)$(BINDIR)/oom-sort
install -m0755 psi-top $(DESTDIR)$(BINDIR)/psi-top install -m0755 tools/psi-top $(DESTDIR)$(BINDIR)/psi-top
install -m0755 psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor install -m0755 tools/psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor
install -d $(DESTDIR)$(CONFDIR)/nohang install -d $(DESTDIR)$(CONFDIR)/nohang
-git describe --tags --long --dirty > version -git describe --tags --long --dirty > version
-install -m0644 version $(DESTDIR)$(CONFDIR)/nohang/version -install -m0644 version $(DESTDIR)$(CONFDIR)/nohang/version
-rm -fv version -rm -fv version
install -m0644 nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf
install -m0644 nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default
install -m0644 nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf
install -d $(DESTDIR)$(CONFDIR)/logrotate.d install -d $(DESTDIR)$(CONFDIR)/logrotate.d
install -m0644 nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang install -m0644 nohang/nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang
install -d $(DESTDIR)$(MANDIR) install -d $(DESTDIR)$(MANDIR)
gzip -c nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz gzip -c nohang/nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz
gzip -c oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz gzip -c tools/oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz
gzip -c tools/psi-top.1 > $(DESTDIR)$(MANDIR)/psi-top.1.gz
gzip -c tools/psi-monitor.1 > $(DESTDIR)$(MANDIR)/psi-monitor.1.gz
-install -d $(DESTDIR)$(SYSTEMDUNITDIR) -install -d $(DESTDIR)$(SYSTEMDUNITDIR)
-sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang.service.in > nohang.service -sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang/nohang.service.in > nohang.service
-install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
-rm -fv nohang.service -rm -fv nohang.service
-chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
@ -41,29 +43,31 @@ install:
install-desktop: install-desktop:
install -d $(DESTDIR)$(BINDIR) install -d $(DESTDIR)$(BINDIR)
install -m0755 nohang $(DESTDIR)$(BINDIR)/nohang install -m0755 nohang/nohang $(DESTDIR)$(BINDIR)/nohang
install -m0755 oom-sort $(DESTDIR)$(BINDIR)/oom-sort install -m0755 tools/oom-sort $(DESTDIR)$(BINDIR)/oom-sort
install -m0755 psi-top $(DESTDIR)$(BINDIR)/psi-top install -m0755 tools/psi-top $(DESTDIR)$(BINDIR)/psi-top
install -m0755 psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor install -m0755 tools/psi-monitor $(DESTDIR)$(BINDIR)/psi-monitor
install -d $(DESTDIR)$(CONFDIR)/nohang install -d $(DESTDIR)$(CONFDIR)/nohang
-git describe --tags --long --dirty > version -git describe --tags --long --dirty > version
-install -m0644 version $(DESTDIR)$(CONFDIR)/nohang/version -install -m0644 version $(DESTDIR)$(CONFDIR)/nohang/version
-rm -fv version -rm -fv version
install -m0644 nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf
install -m0644 nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf.default install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(CONFDIR)/nohang/nohang-desktop.conf.default
install -m0644 nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default install -m0644 nohang/nohang.conf $(DESTDIR)$(CONFDIR)/nohang/nohang.conf.default
install -d $(DESTDIR)$(CONFDIR)/logrotate.d install -d $(DESTDIR)$(CONFDIR)/logrotate.d
install -m0644 nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang install -m0644 nohang/nohang.logrotate $(DESTDIR)$(CONFDIR)/logrotate.d/nohang
install -d $(DESTDIR)$(MANDIR) install -d $(DESTDIR)$(MANDIR)
gzip -c nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz gzip -c nohang/nohang.1 > $(DESTDIR)$(MANDIR)/nohang.1.gz
gzip -c oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz gzip -c tools/oom-sort.1 > $(DESTDIR)$(MANDIR)/oom-sort.1.gz
gzip -c tools/psi-top.1 > $(DESTDIR)$(MANDIR)/psi-top.1.gz
gzip -c tools/psi-monitor.1 > $(DESTDIR)$(MANDIR)/psi-monitor.1.gz
-install -d $(DESTDIR)$(SYSTEMDUNITDIR) -install -d $(DESTDIR)$(SYSTEMDUNITDIR)
-sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang.service.in > nohang.service -sed "s|:TARGET_BIN:|$(BINDIR)|g;s|:TARGET_CONF:|$(CONFDIR)|g" nohang/nohang.service.in > nohang.service
-install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
-rm -fv nohang.service -rm -fv nohang.service
-chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -chcon -t systemd_unit_file_t $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
@ -79,6 +83,8 @@ uninstall:
rm -fv $(DESTDIR)$(BINDIR)/psi-monitor rm -fv $(DESTDIR)$(BINDIR)/psi-monitor
rm -fv $(DESTDIR)$(MANDIR)/nohang.1.gz rm -fv $(DESTDIR)$(MANDIR)/nohang.1.gz
rm -fv $(DESTDIR)$(MANDIR)/oom-sort.1.gz rm -fv $(DESTDIR)$(MANDIR)/oom-sort.1.gz
rm -fv $(DESTDIR)$(MANDIR)/psi-top.1.gz
rm -fv $(DESTDIR)$(MANDIR)/psi-monitor.1.gz
rm -fv $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service rm -fv $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
rm -fvr $(DESTDIR)$(CONFDIR)/nohang/ rm -fvr $(DESTDIR)$(CONFDIR)/nohang/
rm -fvr $(DESTDIR)$(CONFDIR)/logrotate.d/nohang rm -fvr $(DESTDIR)$(CONFDIR)/logrotate.d/nohang
@ -91,7 +97,7 @@ systemd:
-systemctl status nohang -systemctl status nohang
pylint: pylint:
-pylint3 -E nohang -pylint3 -E nohang/nohang
-pylint3 -E oom-sort -pylint3 -E tools/oom-sort
-pylint3 -E psi-top -pylint3 -E tools/psi-top
-pylint3 -E psi-monitor -pylint3 -E tools/psi-monitor

0
nohang → nohang/nohang
View File

0
nohang-desktop.conf → nohang/nohang-desktop.conf
View File

0
nohang.1 → nohang/nohang.1
View File

0
nohang.conf → nohang/nohang.conf
View File

0
nohang.logrotate → nohang/nohang.logrotate
View File

0
nohang.service.in → nohang/nohang.service.in
View File

0
test.conf → nohang/test.conf
View File

0
oom-sort → tools/oom-sort
View File

0
oom-sort.1 → tools/oom-sort.1
View File

0
psi-monitor → tools/psi-monitor
View File

5
tools/psi-monitor.1 Normal file
View File

@ -0,0 +1,5 @@
.TH psi-monitor 1
.SH NAME
psi-monitor \- PSI metrics monitor

0
psi-top → tools/psi-top
View File

5
tools/psi-top.1 Normal file
View File

@ -0,0 +1,5 @@
.TH psi-top 1
.SH NAME
psi-top \- psi-top