Skip to content

Issue #489, removing unnecessary provision check #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Issue #489, removing unnecessary provision check #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
147edf1
Removed unnecessary provison check
Mar 14, 2020
aa270ea
Removed unnecessary provision check
Mar 14, 2020
b892a17
Fixing trailing whitespaces in comment
Mar 14, 2020
32b3172
Added self. before class varible
Mar 14, 2020
3845ca9
Removed unnecessay provision check, added self. before class variable
Dec 14, 2020
98c4ae2
Merge branch 'master' of https://github.com/arnavkohli/python-zulip-api
Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zulip/zulip/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def fail(self):
# Exponential growth with ratio sqrt(2); compute random delay
# between x and 2x where x is growing exponentially
delay_scale = int(2 ** (self.number_of_retries / 2.0 - 1)) + 1
delay = min(delay_scale + random.randint(1, delay_scale), delay_cap)
delay = min(delay_scale + random.randint(1, delay_scale), self.delay_cap)
message = "Sleeping for %ss [max %s] before retrying." % (delay, delay_scale * 2)
try:
logger.warning(message)
Expand Down
11 changes: 8 additions & 3 deletions zulip_bots/zulip_bots/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,14 @@ def main() -> None:
lib_module = finder.import_module_by_name(args.bot)
if lib_module:
bot_name = lib_module.__name__
if args.provision:
print("ERROR: Could not load bot's module for '{}'. Exiting now.")
sys.exit(1)

# Removed: Not needed as lib_module would have
# been imported during runtime if control
# flow reaches here. Adding any other provision
# check after this would be unnecessary as
# provision_bots require bot_path which
# could not be found, hence result is None
# and control is here.

if lib_module is None:
print("ERROR: Could not load bot module. Exiting now.")
Expand Down