tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool

Browse source
This commit is contained in:
Michael 2016-12-01 13:58:47 +00:00
parent 6ef69ad2da eff4ad2e0a
commit c5d571287c
2 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
boot.php
View file

@ -2365,6 +2365,29 @@ function get_lockpath() {
return ""; return "";
} }
function get_spoolpath() {
$spoolpath = get_config('system','spoolpath');
if (($spoolpath != "") AND is_dir($spoolpath) AND is_writable($spoolpath))
return($spoolpath);
$temppath = get_temppath();
if ($temppath != "") {
$spoolpath = $temppath."/spool";
if (!is_dir($spoolpath))
mkdir($spoolpath);
elseif (!is_writable($spoolpath))
$spoolpath = $temppath;
if (is_dir($spoolpath) AND is_writable($spoolpath)) {
set_config("system", "spoolpath", $spoolpath);
return($spoolpath);
}
}
return "";
}
function get_temppath() { function get_temppath() {
$a = get_app(); $a = get_app();

19
include/items.php
View file

@ -417,6 +417,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$dsprsig = null; $dsprsig = null;
if (x($arr,'dsprsig')) { if (x($arr,'dsprsig')) {
$encoded_signature = $arr['dsprsig'];
$dsprsig = json_decode(base64_decode($arr['dsprsig'])); $dsprsig = json_decode(base64_decode($arr['dsprsig']));
unset($arr['dsprsig']); unset($arr['dsprsig']);
} }
@ -846,14 +847,24 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
} else { } else {
// This can happen - for example - if there are locking timeouts. // This can happen - for example - if there are locking timeouts.
logger("Item wasn't stored - we quit here."); logger("Item wasn't stored - we quit here.");
q("COMMIT"); q("ROLLBACK");
// Store the data into a spool file so that we can try again later.
// At first we restore the Diaspora signature that we removed above.
if (isset($encoded_signature))
$arr['dsprsig'] = $encoded_signature;
// Now we store the data in the spool directory
$spool = get_spoolpath().'/'.round(microtime(true) * 10000).".msg";
file_put_contents($spool, json_encode($arr));
return 0; return 0;
} }
if ($current_post == 0) { if ($current_post == 0) {
// This is one of these error messages that never should occur. // This is one of these error messages that never should occur.
logger("couldn't find created item - we better quit now."); logger("couldn't find created item - we better quit now.");
q("COMMIT"); q("ROLLBACK");
return 0; return 0;
} }
@ -868,7 +879,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
if (!dbm::is_result($r)) { if (!dbm::is_result($r)) {
// This shouldn't happen, since COUNT always works when the database connection is there. // This shouldn't happen, since COUNT always works when the database connection is there.
logger("We couldn't count the stored entries. Very strange ..."); logger("We couldn't count the stored entries. Very strange ...");
q("COMMIT"); q("ROLLBACK");
return 0; return 0;
} }
@ -883,7 +894,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
} elseif ($r[0]["entries"] == 0) { } elseif ($r[0]["entries"] == 0) {
// This really should never happen since we quit earlier if there were problems. // This really should never happen since we quit earlier if there were problems.
logger("Something is terribly wrong. We haven't found our created entry."); logger("Something is terribly wrong. We haven't found our created entry.");
q("COMMIT"); q("ROLLBACK");
return 0; return 0;
} }