Merge branch 'master' into merge-mining

docker-compose/statistics/app/p2pool_statistics.py

@@ -60,6 +60,16 @@ def render():
             network_stats = json.loads(reader.read())
         with open("/data/local/stratum", "r") as reader:
             local_stats = json.loads(reader.read())
+        workers = local_stats["workers"][:30] # limit workers output list
+        workers_concat = []
+        for w in workers:
+            w_list = w.split(",")
+            w_list[1] = humanfriendly.format_timespan(int(w_list[1]))
+            w_list[2] = human_numbers(int(w_list[2]))
+            workers_concat.append(w_list)
+        workers_concat = sorted(workers_concat, key=lambda x: int(x[3]), reverse=True)
+        for w in workers_concat:
+            w[3] = human_numbers(int(w[3]))
         return render_template(
             "index.html",
             my_bday=my_bday,
@@ -67,6 +77,7 @@ def render():
             pool_stats=pool_stats,
             network_stats=network_stats,
             local_stats=local_stats,
+            workers=workers_concat,
         )
     except Exception as e:
         return render_template("oops.html", error=str(e))

docker-compose/statistics/app/templates/index.html

@@ -64,6 +64,29 @@
                     <td>Block reward share</td>
                     <td>{{ local_stats["block_reward_share_percent"] }}%</td>
                   </tr>
+                  <tr>
+                    <td>Workers
+                      <h6 class="card-subtitle text-muted" style="font-size:80%;">(note: limited to the first 30 workers)</h6>
+                    </td>
+                    <td>
+                      <table style="font-size:65%;">
+                        <tr>
+                          <th>IP:Port</th>
+                          <th>Uptime</th>
+                          <th>Difficulty</th>
+                          <th>Hashrate</th>
+                          <th>Name</th>
+                        </tr>
+                        {% for w in workers %}
+                        <tr>
+                          {% for w_detail in w %}
+                          <td>{{ w_detail }}</td>
+                          {% endfor %}
+                        </tr>
+                        {% endfor %}
+                      </table> 
+                    </td>
+                  </tr> 
                 </tbody>
               </table>
             </div>

src/util.h

@@ -35,7 +35,7 @@
 namespace p2pool {
 
 #define P2POOL_VERSION_MAJOR 3
-#define P2POOL_VERSION_MINOR 9
+#define P2POOL_VERSION_MINOR 10
 #define P2POOL_VERSION_PATCH 0
 
 extern const char* VERSION;