Browse Source

Working; removed all debugging code

Yentl Van Tendeloo 9 years ago
parent
commit
f709a8bf6b

+ 3 - 25
hybrid_server/classes/mvkcontroller.xml

@@ -118,7 +118,6 @@
                 <state id="execution">
                     <onentry>
                         <script>
-                            print("Exec")
                             self.timeout = False
                             self.destination = None
                             if self.users:
@@ -135,7 +134,6 @@
                                     self.all_failed = False
 
                                 # Now process for some steps, or until we are again blocked for input
-                                print("PROC")
                                 for x in xrange(200):
                                     self.execute_modelverse(user, "execute_rule", [])
 
@@ -167,38 +165,18 @@
                                     self.users.add(name)
                                 self.timeout = self.all_failed
                                 self.all_failed = True
-                            print("Break")
-                            print(self.destination)
-                            print(self.timeout)
                         </script>
                     </onentry>
 
-                    <transition cond="self.destination is not None" after="0" target=".">
-                        <script>
-                            print("T1")
-                        </script>
+                    <transition cond="self.destination is not None" after="0.0001" target=".">
                         <raise event="HTTP_input" scope="narrow" target="'to_mvi/%s' % self.destination">
                             <parameter expr="self.value"/>
                         </raise>
                     </transition>
 
-                    <transition cond="self.timeout and self.destination is None" after="0.1" target=".">
-                        <script>
-                            print("T2")
-                        </script>
-                    </transition>
+                    <transition cond="self.timeout and self.destination is None" after="0.1" target="."/>
 
-                    <transition cond="not self.timeout and self.destination is None" after="0" target=".">
-                        <script>
-                            print("T3")
-                        </script>
-                    </transition>
-
-                    <onexit>
-                        <script>
-                            print("EXIT")
-                        </script>
-                    </onexit>
+                    <transition cond="not self.timeout and self.destination is None" after="0.0001" target="."/>
                 </state>
             </state>
 

+ 1 - 1
hybrid_server/classes/socket.xml

@@ -110,7 +110,7 @@
                     <transition cond="self.closed and len(self.received_data) == 0" target="../closing"/>
                 </state>
                 <state id="closing">
-                    <transition after="0" target=".">
+                    <transition after="0.001" target=".">
                         <raise event="close"/>
                     </transition>
                 </state>

+ 1 - 1
run_local_modelverse.sh

@@ -10,4 +10,4 @@ cd hybrid_server
 ${python} -m sccd.compiler.sccdc -p threads server.xml
 
 echo "Starting MvK"
-${python} -m cProfile run_mvk_server.py $port
+${python} run_mvk_server.py $port