cicada 0.8.2__py3-none-any.whl → 0.9.0__py3-none-any.whl

cicada/commands/exec_schedule.py

@@ -155,11 +155,9 @@ def main(schedule_id, dbname=None):
     command = str(row[0])
     parameters = str(row[1])
 
-    full_command = []
-    full_command.extend(command.split())
-    full_command.extend(parameters.split())
+    full_command = scheduler.get_full_command(command, parameters)
 
-    human_full_command = str(" ".join(full_command))
+    human_full_command = str(command + " " + parameters)
 
     # Check to see that schedule is not already running
     if get_is_running(db_cur, schedule_id) == 0:

cicada/lib/postgres.py

@@ -19,7 +19,9 @@ def db_cicada(dbname=None):
     user = definitions["db_cicada"]["user"]
     password = definitions["db_cicada"]["password"]
 
-    conn = psycopg2.connect(host=host, port=port, dbname=dbname, user=user, password=password, sslmode="prefer")
+    conn = psycopg2.connect(
+        host=host, port=port, dbname=dbname, user=user, password=password, sslmode="require", application_name="cicada"
+    )
     conn.autocommit = True
 
     return conn

cicada/lib/scheduler.py

@@ -11,6 +11,7 @@ import sys
 import os
 import datetime
 import socket
+import shlex
 from croniter import croniter
 
 from cicada.lib import postgres
@@ -252,6 +253,14 @@ def get_schedule_executable(db_cur, schedule_id):
     return obj_schedule_executable
 
 
+def get_full_command(command, parameters):
+    """Generate Full Command"""
+    full_command = []
+    full_command.extend(shlex.split(command))
+    full_command.extend(shlex.split(parameters))
+    return full_command
+
+
 def get_all_schedules(db_cur, server_id, is_async):
     """Extract all candidate schedules for a server
     +--------- minute (0 - 59)

{cicada-0.8.2.dist-info → cicada-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cicada
-Version: 0.8.2
+Version: 0.9.0
 Summary: Lightweight, agent-based, distributed scheduler
 Home-page: https://github.com/transferwise/cicada
 Author: Wise
@@ -8,19 +8,28 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3 :: Only
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psycopg2-binary ==2.9.*
-Requires-Dist: pyyaml ==6.0.*
-Requires-Dist: croniter ==2.0.*
-Requires-Dist: tabulate ==0.9.*
-Requires-Dist: slack-sdk ==3.30.*
-Requires-Dist: backoff ==2.2.*
+Requires-Dist: psycopg2-binary==2.9.*
+Requires-Dist: pyyaml==6.0.*
+Requires-Dist: croniter<3.1,>=2.0
+Requires-Dist: tabulate==0.9.*
+Requires-Dist: slack-sdk==3.37.*
+Requires-Dist: backoff==2.2.*
 Provides-Extra: dev
-Requires-Dist: pytest ==8.2.* ; extra == 'dev'
-Requires-Dist: pytest-cov ==5.0.* ; extra == 'dev'
-Requires-Dist: pytest-mock ==3.14.* ; extra == 'dev'
-Requires-Dist: black ==24.4.* ; extra == 'dev'
-Requires-Dist: flake8 ==7.1.* ; extra == 'dev'
-Requires-Dist: freezegun ==1.5.* ; extra == 'dev'
+Requires-Dist: pytest==8.2.*; extra == "dev"
+Requires-Dist: pytest-cov==5.0.*; extra == "dev"
+Requires-Dist: pytest-mock==3.14.*; extra == "dev"
+Requires-Dist: black==24.4.*; extra == "dev"
+Requires-Dist: flake8==7.1.*; extra == "dev"
+Requires-Dist: freezegun==1.5.*; extra == "dev"
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # Cicada scheduler
 
@@ -58,7 +67,7 @@ Requires-Dist: freezegun ==1.5.* ; extra == 'dev'
 
 ## Setup Central Database
 
-Verified on **PostgreSQL** versions *9.6* to *12.9*
+Verified on **PostgreSQL** versions *12.9* to *15.14*
 
 1. Execute as **postgres** user [setup/db_and_user.sql](setup/db_and_user.sql)
 2. Change **cicada** user password
@@ -69,7 +78,7 @@ Verified on **PostgreSQL** versions *9.6* to *12.9*
 
 ## Setup Node
 
-Verified on *Ubuntu 18.04 and 20.04 LTS*
+Verified on *Ubuntu 18.04, 20.04 LTS and 22.04 LTS*
 
 Prerequisites
 

{cicada-0.8.2.dist-info → cicada-0.9.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ cicada/cli.py,sha256=-2XcWtwRIx8tb0cisdhBT6MFue8ANCOsVrQNIqme_9s,10148
 cicada/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cicada/commands/archive_schedule_log.py,sha256=S0qcFajRcwtXMlOTPkHduXqdHQspzM046UAQxN8oPVo,2231
 cicada/commands/delete_schedule.py,sha256=iNoE243gX9M3bBxOsgiusga5At5UnXIUpHkElsNz8-w,548
-cicada/commands/exec_schedule.py,sha256=ywQEPPBKjzUe2S6Di45F1Iir7TblJ4bnd3psP9oCKMQ,8868
+cicada/commands/exec_schedule.py,sha256=a__pTzJ2vbJrWcMCzhylAekal_W4CkOcZAIOKQSnCms,8832
 cicada/commands/exec_server_schedules.py,sha256=5TyDsQiUH9dx59GLO33aekSoUNO7g_HcHVvJW1yLjj8,1240
 cicada/commands/list_schedules.py,sha256=vzRQVAs2yzsuyGV9yeQEpgmvFL5zIZlyMT-jbR7AybA,545
 cicada/commands/list_server_schedules.py,sha256=-uxikgecitRh8YYe0WgL1AOLO6cfow1_lqmPeSVz4xE,1910
@@ -13,12 +13,12 @@ cicada/commands/show_schedule.py,sha256=fC7jRFN5xrhKEq-9N_evEdBavbS7KtQ5dfgg4IWA
 cicada/commands/spread_schedules.py,sha256=N8ni0n9mFKenC4iiBgw7X9QPV3XZf9L0u5sKvUbajH8,4507
 cicada/commands/upsert_schedule.py,sha256=pacujqNF7lzgHCG9XR4JkSlitV1s99par9hA-dMul8o,3740
 cicada/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cicada/lib/postgres.py,sha256=DTPKRNYTi5yMC6xPPhX2l4U8hpSfTfciE77pfjd_H24,840
-cicada/lib/scheduler.py,sha256=oAidM2NgkOqQ6QzbAA2x-4lVA9K4pJMsPvm-hECgxo8,13201
+cicada/lib/postgres.py,sha256=HEkz_-NPlBFCks3hoqXhrEndYkr8hDRui-NQWFHMqXo,882
+cicada/lib/scheduler.py,sha256=NQHnSw465HWPHRfW5NDCtvcTFOIvX1WWQyJoLb9L5Ao,13432
 cicada/lib/utils.py,sha256=qlXe6DnKJTqrdWeIuj_0fEQ-VhMJSzentf28KV-7uOs,2247
-cicada-0.8.2.dist-info/LICENSE,sha256=jj_FHHgRjgQBUlPrrRsnr50zEOAhlg6gqU7mEqisyB0,10844
-cicada-0.8.2.dist-info/METADATA,sha256=iBxdfaTSf6akdljQvj3nAHNNjBQYAQd01YTqZ0LSs9E,5669
-cicada-0.8.2.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-cicada-0.8.2.dist-info/entry_points.txt,sha256=Dzf3ul9hWITR4nfTDyNCtFTcQOOE57mD1x2qVniUWdE,43
-cicada-0.8.2.dist-info/top_level.txt,sha256=xZCtaMDbCi2CKA5PExum99ZU54IJg5iognV-k44a1W0,7
-cicada-0.8.2.dist-info/RECORD,,
+cicada-0.9.0.dist-info/licenses/LICENSE,sha256=jj_FHHgRjgQBUlPrrRsnr50zEOAhlg6gqU7mEqisyB0,10844
+cicada-0.9.0.dist-info/METADATA,sha256=0N9PhqIF46kSHxd9Jw2p8iq9gex_vlA1KSYP3iut_AA,5863
+cicada-0.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cicada-0.9.0.dist-info/entry_points.txt,sha256=Dzf3ul9hWITR4nfTDyNCtFTcQOOE57mD1x2qVniUWdE,43
+cicada-0.9.0.dist-info/top_level.txt,sha256=xZCtaMDbCi2CKA5PExum99ZU54IJg5iognV-k44a1W0,7
+cicada-0.9.0.dist-info/RECORD,,

{cicada-0.8.2.dist-info → cicada-0.9.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any