Skip to content

Commit 11888eb

Browse files
author
Tim Bielawa
committed
Fix 'Invoking func method' output inserting an empty string for the called method if log is viewed in HTML.
1 parent 1e78119 commit 11888eb

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

contrib/rpm/re-worker-func.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Name: re-worker-func
1111
Summary: RE Worker to run commands over Func
1212
Version: 0.0.3
13-
Release: 4%{?dist}
13+
Release: 5%{?dist}
1414

1515
Group: Applications/System
1616
License: AGPLv3
@@ -40,6 +40,9 @@ Release Engine Worker to run commands over Func.
4040
%exclude %{python2_sitelib}/%{_pkg_name}/__init__.py*
4141

4242
%changelog
43+
* Mon Jun 23 2014 Tim Bielawa <[email protected]> - 0.0.3-5
44+
- Fix 'Invoking func method' output inserting an empty string for the called method
45+
4346
* Fri Jun 20 2014 Steve Milner <[email protected]> - 0.0.3-4
4447
- Try loops now work properly.
4548

replugin/funcworker/__init__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,15 @@ def process(self, channel, basic_deliver, properties, body, output):
170170
getattr(client, params['command']),
171171
# Next get the client.COMMAND.SUBCOMMAND method
172172
params['subcommand'])
173-
173+
target_callable_repr = "%s.%s" % (
174+
params['command'],
175+
params['subcommand'])
174176
for attempt_count in range(_tries):
175177
self.app_logger.info("In the for loop (over _tries)")
176178
output.debug(
177179
'Invoking func method: "%s" with args: "%s"' % (
178-
str(target_callable), str(target_params)))
180+
str(target_callable_repr),
181+
str(target_params)))
179182
# Call the fc.Client.COMMAND.SUBCOMMAND
180183
# method with the collected parameters
181184
job_id = target_callable(*target_params)

0 commit comments

Comments
 (0)