diff options
author | Udo Walter | 2017-11-21 17:52:04 +0100 |
---|---|---|
committer | Udo Walter | 2017-11-21 17:52:04 +0100 |
commit | 653851f35d0eea172c2302e9f1b6f0d03c70096c (patch) | |
tree | 42f267c360104b98d2e3199273adba62a1e2023b /modules-available/syslog/install.inc.php | |
parent | [internetaccess] reworked permission system from "click and you get error" to... (diff) | |
parent | [statistics] Also adapt MAC-UUID fixing code to mltk changes (diff) | |
download | slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.gz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.xz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.zip |
Merge remote-tracking branch 'origin/master' into permission-manager
# Conflicts:
# modules-available/backup/templates/_page.html
# style/default.css
Diffstat (limited to 'modules-available/syslog/install.inc.php')
-rw-r--r-- | modules-available/syslog/install.inc.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules-available/syslog/install.inc.php b/modules-available/syslog/install.inc.php index 539f2449..406a6cc6 100644 --- a/modules-available/syslog/install.inc.php +++ b/modules-available/syslog/install.inc.php @@ -2,7 +2,7 @@ $res = array(); -$res[] = tableCreate('clientlog', " +$res[] = $tc = tableCreate('clientlog', " `logid` int(10) unsigned NOT NULL AUTO_INCREMENT, `dateline` int(10) unsigned NOT NULL, `logtypeid` varchar(30) NOT NULL, @@ -14,7 +14,7 @@ $res[] = tableCreate('clientlog', " KEY `dateline` (`dateline`), KEY `logtypeid` (`logtypeid`,`dateline`), KEY `clientip` (`clientip`,`dateline`), - KEY `machineuuid` (`machineuuid`,`dateline`) + KEY `machineuuid` (`machineuuid`,`logid`) "); // Update path @@ -29,6 +29,12 @@ if (!tableHasColumn('clientlog', 'machineuuid')) { $res[] = UPDATE_DONE; } +// 2017-11-03: Create proper index for query in statistics module +if ($tc !== UPDATE_DONE) { + Database::exec("ALTER TABLE `openslx`.`clientlog` DROP INDEX `machineuuid` , + ADD INDEX `machineuuid` ( `machineuuid` , `logid` )"); +} + // Create response for browser if (in_array(UPDATE_DONE, $res)) { |