Merge pull request JoinMarket-Org#125 from haarts/master

Prevents startup spam to log.

ob-watcher.py

@@ -1,4 +1,3 @@
-
 import BaseHTTPServer, SimpleHTTPServer, threading
 from decimal import Decimal
 import urllib2

yield-generator.py

@@ -31,23 +31,30 @@
 #spent from utxos that try to make the highest balance even higher
 # so try to keep coins concentrated in one mixing depth
 class YieldGenerator(Maker):
+ statement_file = os.path.join('logs', 'yigen-statement.csv')
+
  def __init__(self, msgchan, wallet):
  Maker.__init__(self, msgchan, wallet)
  self.msgchan.register_channel_callbacks(self.on_welcome, self.on_set_topic,
  None, None, self.on_nick_leave, None)
  self.tx_unconfirm_timestamp = {}
 
  def log_statement(self, data):
+ if common.get_network() == 'testnet':
+ return
+
  data = [str(d) for d in data]
- self.income_statement = open(os.path.join('logs', 'yigen-statement.csv'), 'aw')
+ self.income_statement = open(statement_file, 'a')
  self.income_statement.write(','.join(data) + '\n')
  self.income_statement.close()
 
  def on_welcome(self):
  Maker.on_welcome(self)
- self.log_statement(['timestamp', 'cj amount/satoshi', 'my input count',
- 'my input value/satoshi', 'cjfee/satoshi', 'earned/satoshi',
- 'confirm time/min', 'notes'])
+ if not os.path.isfile(statement_file):
+ self.log_statement(['timestamp', 'cj amount/satoshi', 'my input count',
+ 'my input value/satoshi', 'cjfee/satoshi', 'earned/satoshi',
+ 'confirm time/min', 'notes'])
+
  timestamp = datetime.datetime.now().strftime("%Y/%m/%d %H:%M:%S")
  self.log_statement([timestamp, '', '', '', '', '', '', 'Connected'])