new LogView class - implement openvz initlog viewer

diff --git a/www/manager/Makefile b/www/manager/Makefile
index 22f40d0710802cdbbf232663dc16e14f0db20a5b..eda66fa1be04df1262d02e57135483b180085599 100644 (file)
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -60,6 +60,7 @@ JSSRC=                                                        \
        tree/ResourceTree.js                            \
        panel/ConfigPanel.js                            \
        grid/BackupView.js                              \
+       grid/LogView.js                                 \
        node/DNSEdit.js                                 \
        node/DNSView.js                                 \
        node/TimeView.js                                \
@@ -70,7 +71,6 @@ JSSRC=                                                        \
        node/ServiceView.js                             \
        node/NetworkEdit.js                             \
        node/NetworkView.js                             \
-       node/Syslog.js                                  \
        node/Tasks.js                                   \
        node/Config.js                                  \
        qemu/StatusView.js                              \

diff --git a/www/manager/grid/LogView.js b/www/manager/grid/LogView.js
new file mode 100644 (file)
index 0000000..b80de5a
--- /dev/null
+++ b/www/manager/grid/LogView.js
@@ -0,0 +1,47 @@
+Ext.define('PVE.grig.LogView', {
+    extend: 'Ext.grid.GridPanel',
+
+    alias: ['widget.pveLogView'],
+
+    initComponent : function() {
+       var me = this;
+
+       if (!me.url) {
+           throw "no url specified";
+       }
+
+       var store = Ext.create('Ext.data.Store', {
+           pageSize: 500,
+           buffered: true,
+           model: 'pve-string-list',
+           proxy: {
+                type: 'pve',
+               startParam: 'start',
+               limitParam: 'limit',
+                url: me.url
+           }
+       });
+
+       Ext.apply(me, {
+           store: store,
+           features: [ {ftype: 'selectable'}],
+           stateful: false,
+           verticalScrollerType: 'paginggridscroller',
+           loadMask: true,
+           invalidateScrollerOnRefresh: false,
+           viewConfig: {
+               trackOver: false,
+               stripeRows: false
+           },
+           hideHeaders: true,
+           columns: [ 
+               { header: "Text", dataIndex: 't', flex: 1 } 
+           ]
+       });
+
+       me.callParent();
+
+       store.guaranteeRange(0, store.pageSize - 1);
+    }
+});
+

diff --git a/www/manager/node/Config.js b/www/manager/node/Config.js
index 37514feb11d3744b44c5562d7d9dbe0a14277898..b84ed5b31f9f2a960a16833386b9b53c946b05f0 100644 (file)
--- a/www/manager/node/Config.js
+++ b/www/manager/node/Config.js
@@ -42,7 +42,8 @@ Ext.define('PVE.node.Config', {
                {
                    title: 'Syslog',
                    itemId: 'syslog',
-                   xtype: 'pveNodeSyslog'
+                   xtype: 'pveLogView',
+                   url: "/api2/json/nodes/" + nodename + "/syslog"
                },
                {
                    title: 'Task History',

diff --git a/www/manager/node/Syslog.js b/www/manager/node/Syslog.js
deleted file mode 100644 (file)
index 5bb71d5..0000000
--- a/www/manager/node/Syslog.js
+++ /dev/null
@@ -1,48 +0,0 @@
-Ext.define('PVE.node.Syslog', {
-    extend: 'Ext.grid.GridPanel',
-
-    alias: ['widget.pveNodeSyslog'],
-
-    initComponent : function() {
-       var me = this;
-
-       var nodename = me.pveSelNode.data.node;
-       if (!nodename) {
-           throw "no node name specified";
-       }
-
-       var store = Ext.create('Ext.data.Store', {
-           pageSize: 500,
-           buffered: true,
-           model: 'pve-string-list',
-           proxy: {
-                type: 'pve',
-               startParam: 'start',
-               limitParam: 'limit',
-                url: "/api2/json/nodes/" + nodename + "/syslog"
-           }
-       });
-
-       Ext.apply(me, {
-           store: store,
-           features: [ {ftype: 'selectable'}],
-           stateful: false,
-           verticalScrollerType: 'paginggridscroller',
-           loadMask: true,
-           invalidateScrollerOnRefresh: false,
-           viewConfig: {
-               trackOver: false,
-               stripeRows: false
-           },
-           hideHeaders: true,
-           columns: [ 
-               { header: "Text", dataIndex: 't', flex: 1 } 
-           ]
-       });
-
-       me.callParent();
-
-       store.guaranteeRange(0, store.pageSize - 1);
-    }
-});
-

diff --git a/www/manager/openvz/Config.js b/www/manager/openvz/Config.js
index f496e9935feed396052561e024e6ce1bc6c04e71..5fb5b3fcf947aaff67f0344ba7d601437ffc0628 100644 (file)
--- a/www/manager/openvz/Config.js
+++ b/www/manager/openvz/Config.js
@@ -53,6 +53,12 @@ Ext.define('PVE.openvz.Config', {
                    xtype: 'pveBeanCounterGrid',
                    url: '/api2/json/nodes/' + nodename + '/openvz/' + vmid + '/status/ubc'
                },
+               {
+                   title: "InitLog",
+                   itemId: 'initlog',
+                   xtype: 'pveLogView',
+                   url: '/api2/json/nodes/' + nodename + '/openvz/' + vmid + '/initlog'
+               },
 /*
                {
                    xtype: 'pveOpenVZConsole',