Changeset 1535

Timestamp:

04/23/08 11:34:30 (23 months ago)

Author:

JensDiemer

Message:

• autoamtic plugin menu:
  • add internal page
  • BasePlugin? changes the page title
• first updates for show_internals (but only "system_info" updated)

Location:

trunk/pylucid

Files:

• media/PyLucid/internal_page/admin_menu/plugin_menu.html (added)
• PyLucid/plugins_internal/show_internals/show_internals.py (modified) (2 diffs)
• PyLucid/plugins_internal/show_internals/show_internals_cfg.py (modified) (1 diff)
• PyLucid/plugins_internal/show_internals/system_info.py (modified) (6 diffs)
• PyLucid/system/BasePlugin.py (modified) (1 diff)

trunk/pylucid/PyLucid/plugins_internal/show_internals/show_internals.py

@@ -28 +28 @@
 
 class show_internals(PyLucidBasePlugin):
-    def link( self ):
-        return '<a href="%smenu">show_internals</a>' % self.URLs["action"]
-
-    #_______________________________________________________________________
-
-    def lucidTag(self):
-#        url = self.URLs.actionLink("menu")
-        url = "FIXME"
-        self.response.write('<a href="%s">show internals</a>' % url)
 
     def menu(self):
-        self.response.write(
-            "<h4>show internals <small>(%s)</small></h4>" % \
-                                                        __version__.strip("$ ")
-        )
-        self.response.write(self.module_manager.build_menu())
+        self.build_menu()
 
     #_______________________________________________________________________
@@ -195 +182 @@
         """ Allgemeine System Informationen """
         self.menu()
-        from PyLucid.buildin_plugins.show_internals.system_info \
+        from PyLucid.plugins_internal.show_internals.system_info \
                                                             import SystemInfo
-        s = SystemInfo(self.request, self.response)
+        s = SystemInfo(self.context, self.response)
         s.display_all()
 

trunk/pylucid/PyLucid/plugins_internal/show_internals/show_internals_cfg.py

@@ -29 +29 @@
         "menu_description"  : "System Info",
     },
-    "colubrid_debug": {
-        "must_login"        : True,
-        "must_admin"        : True,
-    },
-    "session_data": {
-        "must_login"        : True,
-        "must_admin"        : True,
-        "menu_section"      : "system",
-        "menu_description"  : "Session data",
-    },
-    "log_data": {
-        "must_login"        : True,
-        "must_admin"        : True,
-        "menu_section"      : "system",
-        "menu_description"  : "LOG data",
-    },
-    "sql_status": {
-        "must_login"        : True,
-        "must_admin"        : True,
-        "menu_section"      : "SQL",
-        "menu_description"  : "SQL table status",
-    },
-    "optimize_sql_tables": {
-        "must_login"    : True,
-        "must_admin"    : True,
-    },
-    "python_modules": {
-        "must_login"        : True,
-        "must_admin"        : True,
-        "menu_section"      : "misc",
-        "menu_description"  : "Display all Python Modules",
-    },
-    "debug_plugin_data": {
-        "must_login"        : True,
-        "must_admin"        : True,
-        "menu_section"      : "Modules/Plugins",
-        "menu_description"  : "Debug all installed module/plugin data",
-    },
-    "module_info": {
-        "must_login"    : True,
-        "must_admin"    : True,
-    },
+#    "session_data": {
+#        "must_login"        : True,
+#        "must_admin"        : True,
+#        "menu_section"      : "system",
+#        "menu_description"  : "Session data",
+#    },
+#    "log_data": {
+#        "must_login"        : True,
+#        "must_admin"        : True,
+#        "menu_section"      : "system",
+#        "menu_description"  : "LOG data",
+#    },
+#    "sql_status": {
+#        "must_login"        : True,
+#        "must_admin"        : True,
+#        "menu_section"      : "SQL",
+#        "menu_description"  : "SQL table status",
+#    },
+#    "optimize_sql_tables": {
+#        "must_login"    : True,
+#        "must_admin"    : True,
+#    },
+#    "python_modules": {
+#        "must_login"        : True,
+#        "must_admin"        : True,
+#        "menu_section"      : "misc",
+#        "menu_description"  : "Display all Python Modules",
+#    },
+#    "debug_plugin_data": {
+#        "must_login"        : True,
+#        "must_admin"        : True,
+#        "menu_section"      : "Modules/Plugins",
+#        "menu_description"  : "Debug all installed module/plugin data",
+#    },
+#    "module_info": {
+#        "must_login"    : True,
+#        "must_admin"    : True,
+#    },
 }

trunk/pylucid/PyLucid/plugins_internal/show_internals/system_info.py

@@ -21 +21 @@
 
 
-import sys, os, locale
-
+import sys, os, locale, subprocess
+
+from PyLucid.tools.subprocess2 import Subprocess2
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
 
@@ -31 +32 @@
         self.PyLucid_info()
         self.system_info()
+        self.cmd_info()
+        self.proc_info()
         self.encoding_info()
         self.envion_info()
-        self.colubrid_debug_link()
 
     #_________________________________________________________________________
@@ -43 +45 @@
         self.response.write('<legend>PyLucid["URLs"]:</legend>')
         self.response.write("<pre>")
-        for k,v in self.URLs.items():
-            self.response.write("%15s: '%s'\n" % (k,v))
-        self.response.write("</pre>")
-        self.response.write("</fieldset>")
-
-        self.response.write('<fieldset id="system_info">')
-        self.response.write('<legend>self.i18n.debug():</legend>')
-        self.response.write("<pre>")
-        self.i18n.debug(response_out=True)
+
+        data = [(len(v), k, v) for k,v in self.URLs.items()]
+
+        max_len = max([len(k) for k in self.URLs])
+        line = "%%%ss: '%%s'\n" % max_len
+
+        for _,k,v in sorted(data):
+            self.response.write(line % (k,v))
+
         self.response.write("</pre>")
         self.response.write("</fieldset>")
@@ -65 +67 @@
             self.response.write("<dd>%s</dd>" % " - ".join( os.uname() ))
 
+        try:
+            loadavg = os.getloadavg()
+            loadavg = ", ".join([str(round(i,2)) for i in loadavg])
+            self.response.write("<dt>load average:</dt>")
+            self.response.write("<dd>%s</dd>" % loadavg)
+        except OSError:
+            # Not available
+            pass
+
         self.response.write("<dt>sys.version:</dt>")
         self.response.write("<dd>Python v%s</dd>" % sys.version)
@@ -77 +88 @@
         self.response.write("</dl>")
 
-        #_____________________________________________________________________
-
-        self.cmd_info( "uptime", "uptime" )
-        self.cmd_info( "lokal Angemeldete Benutzer", "who -H -u --lookup" )
-        self.cmd_info( "disk", "df -T -h" )
-        self.cmd_info( "RAM", "free -m" )
+
+
+    def proc_info(self):
+        """
+        Dispaly some proc files
+        """
+        files = ["/proc/meminfo", "/proc/stat", "/proc/loadavg"]
+
+        self.response.write("<h3>proc info</h3>")
+
+        self.response.write('<dl id="system_info">')
+        for proc_file in files:
+            self.response.write("<dt>'%s':</dt>" % proc_file)
+            try:
+                f = file(proc_file, "r")
+            except Exception, e:
+                self.response.write("<dd>Error: %s</dd>" % e)
+            else:
+                for line in f:
+                    self.response.write("<dd>%s</dd>" % line)
+                f.close()
+        self.response.write("</dl>")
 
     #_________________________________________________________________________
@@ -170 +197 @@
     #_________________________________________________________________________
 
-    def cmd_info(self, info, command, cwd="/"):
-        self.response.write(
-            '<fieldset id="system_info"><legend>%s:</legend>' % info
-        )
-        try:
-            process = self.tools.subprocess2(command, cwd, 5)
-        except Exception,e:
-            self.response.write("Can't get: %s" % e)
-        else:
-            self.response.write("<pre>%s</pre>" % process.out_data)
-        self.response.write("</fieldset>")
-
-
-
-
-
-
-
-
+    def cmd_info(self):
+        """
+        Use some commandline programms and display the output
+        """
+        commands = ("uptime", "who -H -u --lookup", "df -T -h", "free -m")
+
+        for command in commands:
+            self.response.write(
+                """<fieldset><legend>'%s':</legend>""" % command
+            )
+            try:
+                p = Subprocess2(command,
+                    stdout=subprocess.PIPE,
+                    shell = True,
+                    timeout = 1
+                )
+            except Exception, e:
+                self.response.write("Error: %s" % e)
+            else:
+                if not p.killed:
+                    # read only if process ended normaly, otherwise it blocked!
+                    msg = "<pre>%s</pre>" % p.process.stdout.read()
+                else:
+                    msg = "Proecess was killed. Returncode: %s" % (
+                        p.process.returncode
+                    )
+                self.response.write(msg)
+
+            self.response.write("</fieldset>")
+
+
+
+
+
+
+
+

trunk/pylucid/PyLucid/system/BasePlugin.py

@@ -98 +98 @@
             )
 
-        context = {
-            "plugin_name": self.plugin_name,
-            "version": plugin_config.__version__,
-            "menu_data": menu_data,
-        }
+        self.context["PAGE"].title = "%s (%s)" % (
+            self.plugin_name.replace("_", " "), plugin_config.__version__
+        )
+
+        context = {"menu_data": menu_data,}
 
         # Change the internal_page and use them from "admin_menu" plugin.