Merge branch 'develop'

b-simjoo · b-simjoo · commit 93c0b45b3d55 · 2021-04-06T09:42:34.000+04:30
diff --git a/.travis.yml b/.travis.yml
diff --git a/Docs/build failing.svg b/Docs/build failing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="20" role="img" aria-label="build: failing"><title>build: failing</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="80" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="37" height="20" fill="#555"/><rect x="37" width="43" height="20" fill="#e05d44"/><rect width="80" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="195" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="270">build</text><text x="195" y="140" transform="scale(.1)" fill="#fff" textLength="270">build</text><text aria-hidden="true" x="575" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="330">failing</text><text x="575" y="140" transform="scale(.1)" fill="#fff" textLength="330">failing</text></g></svg>
diff --git a/Docs/build passing.svg b/Docs/build passing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="88" height="20" role="img" aria-label="build: passing"><title>build: passing</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="88" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="37" height="20" fill="#555"/><rect x="37" width="51" height="20" fill="#4c1"/><rect width="88" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="195" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="270">build</text><text x="195" y="140" transform="scale(.1)" fill="#fff" textLength="270">build</text><text aria-hidden="true" x="615" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">passing</text><text x="615" y="140" transform="scale(.1)" fill="#fff" textLength="410">passing</text></g></svg>
diff --git a/main.py b/main.py
@@ -1076,33 +1076,43 @@ def idle(self):
         
         if port:
             import cherrypy #user can ignore installing this mudole if now need for http reporting
-            conf = {'global':
-                {
-                    "server.socket_host": '0.0.0.0',
-                    "server.socket_port": port
-                },
-                'log.screen': False
-            }
-            import cherrypy
             class root:
-                def __init__(self, reporter):
+                def __init__(self, reporter, bug_reporter):
                     self.reporter = reporter
+                    self.bug_reporter = bug_reporter
 
                 @cherrypy.expose
                 def index(self):
                     res = '''<html style="weidth:100%"><body><h1>Bugs</h1><hr>
                     <b>what is this page?</b> this project is using a simple 
                     web server to report bugs(exceptions) that found in a running program.
-                    <h2>Bug logs</h2><pre language="json" style="weidth:100%;overflow:auto">'''+html.escape(self.reporter.dumps())+'</pre></body></html>'
+                    <h2>Bug logs</h2><pre language="json" style="weidth:100%;overflow:auto">'''+html.escape(self.bug_reporter.dumps())+'</pre></body></html>'
                     return res
 
+                @cherrypy.expose
+                def build_state(self):
+                    cherrypy.response.headers['Content-Type'] = "image/svg+xml;charset=utf-8"
+                    if self.reporter.data['bugs_count']>0:
+                        return open('Docs/build faling.svg', 'rb')
+                    else:
+                        return open('Docs/build passing.svg', 'rb')
+
                 @cherrypy.expose
                 @cherrypy.tools.json_out()
                 def json(self):
-                    return self.reporter.reports
+                    return self.bug_reporter.reports
 
+            
+            cherrypy.log.access_log.propagate = False
+            cherrypy.tree.mount(root(reporter, bug_reporter),'/')
+            conf = {'global':
+                {
+                    "server.socket_host": '0.0.0.0',
+                    "server.socket_port": port,
+                    'log.screen': False
+                }
+            }
             cherrypy.config.update(conf)
-            cherrypy.tree.mount(root(bug_reporter),'/')
             cherrypy.engine.start()
             web_reporter = True
             
