[tor-commits] [flashproxy/master] Add a die function to alert when the proxy has stopped working.

[dcf at torproject.org]

commit fc83bfec46599ab12569e5b0d93c907f1b5c8255
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Mar 31 16:57:52 2012 -0700

    Add a die function to alert when the proxy has stopped working.
---
 flashproxy.js |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/flashproxy.js b/flashproxy.js
index 178b7ba..786f428 100644
--- a/flashproxy.js
+++ b/flashproxy.js
@@ -218,18 +218,21 @@ function FlashProxy()
         this.fac_addr = get_query_param_addr(this.query, "facilitator", DEFAULT_FACILITATOR_ADDR);
         if (!this.fac_addr) {
             puts("Error: Facilitator spec must be in the form \"host:port\".");
+            this.die();
             return;
         }
 
         this.max_num_proxy_pairs = get_query_param_integer(this.query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS);
         if (this.max_num_proxy_pairs == null || this.max_num_proxy_pairs < 0) {
             puts("Error: max_clients must be a nonnegative integer.");
+            this.die();
             return;
         }
 
         this.facilitator_poll_interval = get_query_param_timespec(this.query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL);
         if (this.facilitator_poll_interval == null || this.facilitator_poll_interval < MIN_FACILITATOR_POLL_INTERVAL) {
             puts("Error: facilitator_poll_interval must be a nonnegative number at least " + MIN_FACILITATOR_POLL_INTERVAL + ".");
+            this.die();
             return;
         }
 
@@ -239,9 +242,11 @@ function FlashProxy()
             this.make_proxy_pair(client_addr, relay_addr);
         } else if (client_addr !== undefined) {
             puts("Error: the \"client\" parameter requires \"relay\" also.")
+            this.die();
             return;
         } else if (relay_addr !== undefined) {
             puts("Error: the \"relay\" parameter requires \"client\" also.")
+            this.die();
             return;
         } else {
             this.proxy_main();
@@ -269,6 +274,7 @@ function FlashProxy()
                like "Component returned failure code: 0x805e0006
                [nsIXMLHttpRequest.open]" on Firefox. */
             puts("Facilitator: exception while connecting: " + repr(err.message) + ".");
+            this.die();
             return;
         }
         xhr.responseType = "text";
@@ -333,6 +339,11 @@ function FlashProxy()
         this.badge.proxy_begin();
     };
 
+    this.die = function() {
+        puts("die");
+        this.badge.set_color("#111");
+    }
+
     /* An instance of a client-relay connection. */
     function ProxyPair(client_addr, relay_addr)
     {
@@ -516,6 +527,10 @@ function Badge()
         this.counter_text.innerHTML = escape_html(String(this.num_proxy_pairs));
     };
 
+    this.set_color = function(color) {
+        this.elem.style.backgroundColor = color;
+    };
+
     this.refresh();
 }