bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-11-04 01:42:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

daily-report.php fix

Browse Source
This commit is contained in:
SJ
2013-05-21 11:03:03 +02:00
parent e20af9d380
commit 74cd173eac
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@@ -4651,6 +4651,11 @@ if test "$have_icc_guide" = "yes" && test "$have_mysql" = "yes"; then
sql_libs="$sql_libs -lguide" sql_libs="$sql_libs -lguide"
fi fi
if test "$have_psql" = "yes"; then
defs="$defs -DNEED_PSQL"
fi
if test "$have_multitenancy" = "yes"; then if test "$have_multitenancy" = "yes"; then
echo "multitenancy support: yes" echo "multitenancy support: yes"
defs="$defs -DHAVE_MULTITENANCY" defs="$defs -DHAVE_MULTITENANCY"

5
configure.in
View File

@@ -400,6 +400,11 @@ if test "$have_icc_guide" = "yes" && test "$have_mysql" = "yes"; then
sql_libs="$sql_libs -lguide" sql_libs="$sql_libs -lguide"
fi fi
if test "$have_psql" = "yes"; then
defs="$defs -DNEED_PSQL"
fi
if test "$have_multitenancy" = "yes"; then if test "$have_multitenancy" = "yes"; then
echo "multitenancy support: yes" echo "multitenancy support: yes"
defs="$defs -DHAVE_MULTITENANCY" defs="$defs -DHAVE_MULTITENANCY"

16
src/defs.h
View File

@@ -8,15 +8,8 @@
#ifdef NEED_MYSQL #ifdef NEED_MYSQL
#include <mysql.h> #include <mysql.h>
#endif #endif
#ifdef NEED_SQLITE3 #ifdef NEED_PSQL
#include <sqlite3.h> #include <libpq-fe.h>
/* for older versions of sqlite3 do not have the sqlite3_prepare_v2() function, 2009.12.30, SJ */
#if SQLITE_VERSION_NUMBER < 3006000
#define sqlite3_prepare_v2 sqlite3_prepare
#endif
#endif #endif
#ifdef HAVE_TRE #ifdef HAVE_TRE
#include <tre/tre.h> #include <tre/tre.h>
@@ -202,8 +195,9 @@ struct session_data {
#ifdef NEED_MYSQL #ifdef NEED_MYSQL
MYSQL mysql; MYSQL mysql;
#endif #endif
#ifdef NEED_SQLITE3 #ifdef NEED_PSQL
sqlite3 *db; PGconn *psql;
char conninfo[SMALLBUFSIZE];
#endif #endif
}; };

1
util/daily-report.php
View File

@@ -97,6 +97,7 @@ $mail = new ModelMailMail();
$averagesqlsizeraw = $sqlsizeraw / $counters['rcvd']; $averagesqlsizeraw = $sqlsizeraw / $counters['rcvd'];
$averagesphinxsizeraw = $sphinxsizeraw / $counters['rcvd']; $averagesphinxsizeraw = $sphinxsizeraw / $counters['rcvd'];
$averagesizedayraw = ($averagemessagesizeraw+$averagesqlsizeraw+$averagesphinxsizeraw) * $averagemessagesweekraw; $averagesizedayraw = ($averagemessagesizeraw+$averagesqlsizeraw+$averagesphinxsizeraw) * $averagemessagesweekraw;
$datapart = 0;
foreach($shortdiskinfo as $part) { foreach($shortdiskinfo as $part) {
if( $part['partition'] == DATA_PARTITION ) { $datapart = $part['freespace']*1024; } if( $part['partition'] == DATA_PARTITION ) { $datapart = $part['freespace']*1024; }
} }