Changeset 1681:7a2cb17411e2

Timestamp:

06/26/08 18:51:36 (4 months ago)

Author:

klai@…

Branch:

default

Message:

Print user-friendly error when there are insufficient funds in account

Location:

src/Tycoon

Files:

• BankClient.py (modified) (1 diff)
• CmdLineAuctioneerClient.py (modified) (15 diffs)

src/Tycoon/BankClient.py

@@ -129 +129 @@
         if "error" in result:
             raise BankClientException(
-                "Could not transfer %s funds from %s to %s:\n%s" % (
+                "Could not transfer %s funds from %s to %s: %s" % (
                 amount, src_account, dest_account, result['error']))
 

src/Tycoon/CmdLineAuctioneerClient.py

@@ -484 +484 @@
         
     def __multi_host_command(
-        self, host_addrs, finish_cb, finish_arg, command, *args):
+        self, host_addrs, finish_cb, error_cb, finish_arg, command, *args):
         """Perform the specified command on multiple hosts.
         """
@@ -494 +494 @@
             d = f(*args)
             d.addCallback(finish_cb, host_addr, auc, finish_arg, *args)
+            if error_cb != None:
+                d.addErrback(error_cb, host_addr, auc, finish_arg, *args)
+                
             d.addErrback(self.__host_eb, command, host_addr)
             dl.append(d)
@@ -576 +579 @@
         bid, config, min_duration = Bid.parse(args)
         d, dl = self.__multi_host_command(
-            host_addrs, self.__bid_finish, None, "bid", bid,
+            host_addrs, self.__bid_finish, None, None, "bid", bid,
             self.__options.HostAccountName)
         d.addCallback(self.__multi_host_finish)
@@ -612 +615 @@
             args[1:], duration=[100000000L], config_names=config_names)
         d, dl = self.__multi_host_command(
-            host_addrs, self.__create_account_cb, 
+            host_addrs, self.__create_account_cb, self.__create_account_error,
             (0, max_deposit, min_duration), "create_account", initial_deposit,
             bid, config, self.__options.HostAccountName)
@@ -654 +657 @@
         return rval
 
+    def __create_account_error(
+        self, result, host_addr, auc, args, initial_deposit, bid, config,
+        account_name):
+        self.__l.error(result.value)
+
     def __parse_status_fields(self, args):
         """
@@ -686 +694 @@
         bid, config, min_duration = Bid.parse(args[1:])
         d, dl = self.__multi_host_command(
-            host_addrs, self.__fund_finish, None, "fund", funding_amount, bid,
-            self.__options.HostAccountName)
+            host_addrs, self.__fund_finish, None, None, "fund", funding_amount,
+            bid, self.__options.HostAccountName)
         d.addCallback(self.__multi_host_finish)
         return d
@@ -722 +730 @@
             time_out = 30.0
         d, dl = self.__multi_host_command(
-            host_addrs, self.__shutdown_finish, None, "shutdown", time_out,
-            self.__options.HostAccountName)
+            host_addrs, self.__shutdown_finish, None, None, "shutdown", 
+            time_out, self.__options.HostAccountName)
         d.addCallback(self.__multi_host_finish)
         return d
@@ -762 +770 @@
                 value = args[1]
         d, dl = self.__multi_host_command(
-            host_addrs, self.__set_finish, None, "set", field, value,
+            host_addrs, self.__set_finish, None, None, "set", field, value,
             self.__options.HostAccountName)
         d.addCallback(self.__multi_host_finish)
@@ -789 +797 @@
         bid, config, min_duration = Bid.parse(args[1:])
         d, dl = self.__multi_host_command(
-            host_addrs, self.__refund_finish, None, "refund", refund, bid,
+            host_addrs, self.__refund_finish, None, None, "refund", refund, bid,
             self.__options.HostAccountName)
         d.addCallback(self.__multi_host_finish)
@@ -820 +828 @@
         fields = self.__parse_status_fields(args)
         d, dl = self.__multi_host_command(
-            host_addrs, self.__get_status_finish, None, "get_status", fields)
+            host_addrs, self.__get_status_finish, None, None, "get_status",
+            fields)
         d.addCallback(self.__multi_host_finish)
         return d
@@ -845 +854 @@
             raise ArgumentError("Incorrect number of arguments")
         d, dl = self.__multi_host_command(
-            host_addrs, self.__get_account_list_finish, None,
+            host_addrs, self.__get_account_list_finish, None, None,
             "get_account_list", bank_account_name)
         d.addCallback(self.__multi_host_finish)
@@ -870 +879 @@
         fields = self.__parse_status_fields(args)
         d, dl = self.__multi_host_command(
-            host_addrs, self.__get_account_status_finish, None,
+            host_addrs, self.__get_account_status_finish, None, None, 
             "get_account_status", fields, self.__options.HostAccountName)
         d.addCallback(self.__multi_host_finish)
@@ -900 +909 @@
             raise ArgumentError("Incorrect number of arguments")
         d, dl = self.__multi_host_command(
-            host_addrs, self.__delete_account_finish, None, "delete_account",
-            an)
+            host_addrs, self.__delete_account_finish, None, None, 
+            "delete_account", an)
         d.addCallback(self.__multi_host_finish)
         return d
@@ -932 +941 @@
             time_out = 60.0
         d, dl = self.__multi_host_command(
-            host_addrs, self.__boot_finish, None, "boot", time_out,
+            host_addrs, self.__boot_finish, None, None, "boot", time_out,
             self.__options.HostAccountName)
         d.addCallback(self.__multi_host_finish)
@@ -959 +968 @@
 
         d, dl = self.__multi_host_command(
-            host_addrs, self.__configure_file_system_finish, None, 
+            host_addrs, self.__configure_file_system_finish, None, None, 
             "configure_file_system", file_system_path, 
             self.__options.HostAccountName)