Skip to content

Commit 543a470

Browse files
committed
System Touch
1 parent 1991ce7 commit 543a470

7 files changed

Lines changed: 23 additions & 16 deletions

File tree

source/bitcoin/module/TraderModule.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import bitcoin.time.BitcoinAmericaAndNewYorkDate;
66
import commons.CommonRails;
77
import server.nitro.NitroWebExpress;
8-
import server.nitro.WebExpress;
98

109
import exceptions.ExceptionHandler;
1110
import java.io.BufferedReader;
@@ -142,6 +141,7 @@ public String get_wallet_name(final String URL)
142141
catch (Exception e)
143142
{
144143
ExceptionHandler.dispatch(e);
144+
145145
CommonRails.printSystemComponent(this, this.hashCode(), "0x8A66Ea");
146146
}
147147

@@ -177,6 +177,7 @@ public void delete_wallet(final String URL) throws IOException
177177
catch (Exception e)
178178
{
179179
ExceptionHandler.dispatch(e);
180+
180181
CommonRails.printSystemComponent(this, this.hashCode(), "0x8A66Ea");
181182
}
182183
}
@@ -192,6 +193,7 @@ public void unload_wallet(final String URL) throws IOException
192193
catch (Exception e)
193194
{
194195
ExceptionHandler.dispatch(e);
196+
195197
CommonRails.printSystemComponent(this, this.hashCode(), "0x8A66Ea");
196198
}
197199
}
@@ -207,6 +209,7 @@ public void rename_wallet(final String URL)
207209
catch (Exception e)
208210
{
209211
ExceptionHandler.dispatch(e);
212+
210213
CommonRails.printSystemComponent(this, this.hashCode(), "0x8A66Ea");
211214
}
212215
}
@@ -222,6 +225,7 @@ public void add_new_wallet(final String URL)
222225
catch (Exception e)
223226
{
224227
ExceptionHandler.dispatch(e);
228+
225229
CommonRails.printSystemComponent(this, this.hashCode(), "0x8A66Ea");
226230
}
227231
}
@@ -237,6 +241,7 @@ public void send_local_wallet_to_remote_wallet(final String URL)
237241
catch (Exception e)
238242
{
239243
ExceptionHandler.dispatch(e);
244+
240245
CommonRails.printSystemComponent(this, this.hashCode(), "0x8A66Ea");
241246
}
242247
}

source/connections/ConnectionPoller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import exceptions.ExceptionHandler;
77
import messaging.MessageQueue;
88
import server.base.BaseServer;
9-
import server.nitro.WebExpress;
9+
import server.webexpress.WebExpress;
1010
import telnet.TelnetMessageQueue;
1111

1212
import java.io.BufferedReader;

source/messaging/MessageQueueSorter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import commons.CommonRails;
44
import commons.socket.SocketUtils;
55
import exceptions.ExceptionHandler;
6-
import server.nitro.WebExpress;
6+
import server.webexpress.WebExpress;
77

88
import java.io.BufferedWriter;
99
import java.io.IOException;

source/server/nitro/NitroWebExpress.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import messaging.MessageQueue;
1414
import messaging.MessageQueueSorter;
1515
import national.NationalID;
16+
import server.webexpress.WebExpress;
1617

1718
import java.io.BufferedReader;
1819
import java.io.BufferedWriter;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package server.nitro;
1+
package server.webexpress;
22

33
import commons.CommonRails;
44
import messaging.MessageQueue;
@@ -74,7 +74,7 @@ public WebExpress(final String HOST, final Integer PORT, final String THREAD_NAM
7474

7575
this.TELNET_COMMUNICATION_PROXY.OUTPUT_BUILDER.setName("TelnetCommunicationProxy.Builder.Output");
7676

77-
this.TELNET_COMMUNICATION_PROXY.input_builder.setName("TelnetCommunicationProxy.Builder.Input");
77+
this.TELNET_COMMUNICATION_PROXY.INPUT_BUILDER.setName("TelnetCommunicationProxy.Builder.Input");
7878
}
7979
else
8080
{

source/telnet/TelnetCommunicationProxy.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
import commons.CommonRails;
44
import exceptions.ExceptionHandler;
5-
import server.nitro.WebExpress;
5+
import server.webexpress.WebExpress;
66

77
import java.io.BufferedReader;
88
import java.io.BufferedWriter;
99
import java.net.InetAddress;
1010
import java.net.Socket;
11-
import java.util.Date;
1211

1312
public class TelnetCommunicationProxy
1413
{
@@ -28,7 +27,7 @@ public class TelnetCommunicationProxy
2827

2928
public TelnetOutputBuilder OUTPUT_BUILDER;
3029

31-
public TelnetInputBuilder input_builder;
30+
public TelnetInputBuilder INPUT_BUILDER;
3231

3332
public TelnetProxyLivenessMonitor liveness_monitor;
3433

@@ -50,11 +49,11 @@ public TelnetCommunicationProxy(final WebExpress WEB_EXPRESS)
5049

5150
this.OUTPUT_BUILDER = new TelnetOutputBuilder(this);
5251

53-
this.input_builder = new TelnetInputBuilder(this);
52+
this.INPUT_BUILDER = new TelnetInputBuilder(this);
5453

5554
this.OUTPUT_BUILDER.start();
5655

57-
this.input_builder.start();
56+
this.INPUT_BUILDER.start();
5857

5958
this.liveness_monitor = new TelnetProxyLivenessMonitor(this);
6059

@@ -121,7 +120,7 @@ public void run()
121120
proxy.reader.mark(1);
122121
}
123122

124-
proxy.input_builder.telnet_message_queue.add(inbound);
123+
proxy.INPUT_BUILDER.telnet_message_queue.add(inbound);
125124

126125
// ── Outbound: re-enqueue a status ping so OUTPUT_BUILDER stays active ──
127126
TelnetMessageQueue.Message outbound = new TelnetMessageQueue.Message();

source/telnet/TelnetInstaller.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import commons.CommonRails;
44
import exceptions.ExceptionHandler;
5-
import server.nitro.WebExpress;
5+
import server.webexpress.WebExpress;
66

77
import java.io.BufferedReader;
88
import java.io.BufferedWriter;
@@ -36,11 +36,13 @@ public TelnetInstaller(final WebExpress WEB_EXPRESS)
3636

3737
this.process = process_builder.start();
3838

39-
// register process with CommonRails so it can monitor exit/finish events
40-
try {
39+
try
40+
{
4141
CommonRails.registerProcess(this.process_builder, this.process, this);
42-
} catch (Exception ignore) {
43-
// best-effort: don't let registration prevent initialization
42+
}
43+
catch (Exception ignore)
44+
{
45+
ignore.printStackTrace(System.err);
4446
}
4547

4648
this.reader = new BufferedReader(new InputStreamReader(process.getInputStream()));

0 commit comments

Comments
 (0)