Skip to content

Commit

Permalink
Merging deb/5.0.6-1 into 5.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
arlake228 committed Nov 10, 2023
2 parents b4a921a + 5e807db commit f948500
Show file tree
Hide file tree
Showing 106 changed files with 591 additions and 114 deletions.
6 changes: 6 additions & 0 deletions pscheduler-account/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-account (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-account (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:50 -0500

pscheduler-account (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-bitbucket (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-bitbucket (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:51 -0500

pscheduler-archiver-bitbucket (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-esmond (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-esmond (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:49 -0500

pscheduler-archiver-esmond (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-failer (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-failer (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-archiver-failer (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-http (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-http (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-archiver-http (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-kafka (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-kafka (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:50 -0500

pscheduler-archiver-kafka (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-postgresql (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=lo

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-postgresql (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:51 -0500

pscheduler-archiver-postgresql (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-rabbitmq (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-rabbitmq (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-archiver-rabbitmq (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-snmptrap (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-snmptrap (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:49 -0500

pscheduler-archiver-snmptrap (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-syslog (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-syslog (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-archiver-syslog (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
6 changes: 6 additions & 0 deletions pscheduler-archiver-tcp/tcp/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-tcp (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-tcp (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:50 -0500

pscheduler-archiver-tcp (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
6 changes: 6 additions & 0 deletions pscheduler-archiver-udp/udp/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-archiver-udp (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-archiver-udp (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:51 -0500

pscheduler-archiver-udp (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
6 changes: 6 additions & 0 deletions pscheduler-bundle-extras/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-bundle-extras (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-bundle-extras (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-bundle-extras (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
6 changes: 6 additions & 0 deletions pscheduler-bundle-full/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-bundle-full (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-bundle-full (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-bundle-full (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
6 changes: 6 additions & 0 deletions pscheduler-bundle-obsolete/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-bundle-obsolete (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-bundle-obsolete (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-bundle-obsolete (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
6 changes: 6 additions & 0 deletions pscheduler-bundle-snmp/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-bundle-snmp (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-bundle-snmp (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-bundle-snmp (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-context-changefail (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-context-changefail (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:49 -0500

pscheduler-context-changefail (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-context-changenothing (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-context-changenothing (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-context-changenothing (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-context-linuxnns (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-context-linuxnns (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:50 -0500

pscheduler-context-linuxnns (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-context-linuxvrf (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-context-linuxvrf (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:50 -0500

pscheduler-context-linuxvrf (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-core (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-core (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:50 -0500

pscheduler-core (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Index: b/diags.raw
===================================================================
--- a/diags.raw 2023-09-27 10:27:43.501441384 -0400
+++ b/diags.raw 2023-09-27 10:27:46.953200306 -0400
--- a/diags.raw 2023-11-10 15:29:47.799586762 -0500
+++ b/diags.raw 2023-11-10 15:29:50.978139042 -0500
@@ -119,7 +119,7 @@

section "New Tasks by Hour Added"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-docs (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-docs (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:49 -0500

pscheduler-docs (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ pscheduler-jq-library (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low

-- Lætitia Delvaux <[email protected]> Wed, 19 Apr 2023 08:27:55 +0200

pscheduler-jq-library (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <[email protected]> Fri, 10 Nov 2023 15:29:49 -0500

pscheduler-jq-library (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.
Expand Down
23 changes: 1 addition & 22 deletions pscheduler-server/pscheduler-server/daemons/archiver.raw
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import signal
import threading
import time

import daemon
import pscheduler

from dateutil.tz import tzlocal
Expand All @@ -27,17 +26,6 @@ pscheduler.set_graceful_exit()

opt_parser = optparse.OptionParser()

# Daemon-related options

opt_parser.add_option("--daemon",
help="Daemonize",
action="store_true",
dest="daemon", default=False)
opt_parser.add_option("--pid-file",
help="Location of PID file",
action="store", type="string", dest="pidfile",
default=None)

# Program options

opt_parser.add_option("-a", "--archive-defaults",
Expand Down Expand Up @@ -1123,13 +1111,4 @@ def main_program():



with pscheduler.PidFile(options.pidfile) as pidfile:
if options.daemon:
with daemon.DaemonContext(pidfile=pidfile):
# Any return of True means run it again.
while main_program():
pass
else:
# Ibid.
while main_program():
pass
main_program()
19 changes: 1 addition & 18 deletions pscheduler-server/pscheduler-server/daemons/runner
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Execute runs of tasks and put the results into the database.
#

import daemon
import datetime
import errno
import multiprocessing
Expand All @@ -26,17 +25,6 @@ pscheduler.set_graceful_exit()

opt_parser = optparse.OptionParser()

# Daemon-related options

opt_parser.add_option("--daemon",
help="Daemonize",
action="store_true",
dest="daemon", default=False)
opt_parser.add_option("--pid-file",
help="Location of PID file",
action="store", type="string", dest="pidfile",
default=None)

# Program options

opt_parser.add_option("-d", "--dsn",
Expand Down Expand Up @@ -975,9 +963,4 @@ def main_program():
db.close()


with pscheduler.PidFile(options.pidfile) as pidfile:
if options.daemon:
with daemon.DaemonContext(pidfile=pidfile):
main_program()
else:
main_program()
main_program()
Loading

0 comments on commit f948500

Please sign in to comment.