aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-10 15:56:59 -0700
committerfriendica <info@friendica.com>2013-09-10 15:56:59 -0700
commit5aaf8b8e9940d99befd00619238cd20c3894e5a9 (patch)
treeeb8b0af65106d58ed4aeb827789c6102d745bea6
parent58490a4a8098430ed32d0483638d1c6ea3e7ac49 (diff)
parentf93e92c260ca4ef248e5b079b1cd02a4a7d08d6c (diff)
downloadvolse-hubzilla-5aaf8b8e9940d99befd00619238cd20c3894e5a9.tar.gz
volse-hubzilla-5aaf8b8e9940d99befd00619238cd20c3894e5a9.tar.bz2
volse-hubzilla-5aaf8b8e9940d99befd00619238cd20c3894e5a9.zip
Merge pull request #126 from MicMee/master
extends DB in hubloc to maintain hubloc connectivity
-rwxr-xr-xboot.php6
-rw-r--r--install/database.sql2
-rw-r--r--install/update.php9
3 files changed, 11 insertions, 6 deletions
diff --git a/boot.php b/boot.php
index 4c2e27f93..ed645f6ea 100755
--- a/boot.php
+++ b/boot.php
@@ -43,7 +43,7 @@ require_once('include/taxonomy.php');
define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1068 );
+define ( 'DB_UPDATE_VERSION', 1069 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -1206,7 +1206,6 @@ function check_config(&$a) {
// We're reporting a different version than what is currently installed.
// Run any existing update scripts to bring the database up to current.
-
require_once('install/update.php');
// make sure that boot.php and update.php are the same release, we might be
@@ -1214,10 +1213,8 @@ function check_config(&$a) {
// file may not be here yet. This can happen on a very busy site.
if(DB_UPDATE_VERSION == UPDATE_VERSION) {
-
for($x = $stored; $x < $current; $x ++) {
if(function_exists('update_r' . $x)) {
-
// There could be a lot of processes running or about to run.
// We want exactly one process to run the update command.
// So store the fact that we're taking responsibility
@@ -1229,7 +1226,6 @@ function check_config(&$a) {
if(get_config('database','update_r' . $x))
break;
set_config('database','update_r' . $x, '1');
-
// call the specific update
$func = 'update_r' . $x;
diff --git a/install/database.sql b/install/database.sql
index 9b1b6cad2..9ecbad5a6 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -367,6 +367,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
`hubloc_hash` char(255) NOT NULL,
`hubloc_addr` char(255) NOT NULL DEFAULT '',
`hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0',
+ `hubloc_status` int(10) unsigned NOT NULL DEFAULT '0',
`hubloc_url` char(255) NOT NULL DEFAULT '',
`hubloc_url_sig` text NOT NULL,
`hubloc_host` char(255) NOT NULL DEFAULT '',
@@ -379,6 +380,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
KEY `hubloc_url` (`hubloc_url`),
KEY `hubloc_guid` (`hubloc_guid`),
KEY `hubloc_flags` (`hubloc_flags`),
+ KEY `hubloc_status` (`hubloc_status`),
KEY `hubloc_connect` (`hubloc_connect`),
KEY `hubloc_host` (`hubloc_host`),
KEY `hubloc_addr` (`hubloc_addr`),
diff --git a/install/update.php b/install/update.php
index 1b6a2218e..24aed374d 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1068 );
+define( 'UPDATE_VERSION' , 1069 );
/**
*
@@ -782,3 +782,10 @@ function update_r1067() {
return UPDATE_FAILED;
}
+function update_r1068(){
+ $r = q("ALTER TABLE `hubloc` ADD `hubloc_status` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `hubloc_flags` , ADD INDEX ( `hubloc_status` )");
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}
+