projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d7cf259
)
* stat the socket before we try to open it, looks better like that in the log.
author
Wilfried Göesgens
<willi@citadel.org>
Tue, 16 Oct 2007 21:27:50 +0000
(21:27 +0000)
committer
Wilfried Göesgens
<willi@citadel.org>
Tue, 16 Oct 2007 21:27:50 +0000
(21:27 +0000)
ctdlphp/ctdlsession.php
patch
|
blob
|
history
diff --git
a/ctdlphp/ctdlsession.php
b/ctdlphp/ctdlsession.php
index 672d6f636aa7f23fabd87f2d0ef5054072a79461..a47ef2b011f0b4d40fa7b254e4455376ff846a4b 100644
(file)
--- a/
ctdlphp/ctdlsession.php
+++ b/
ctdlphp/ctdlsession.php
@@
-35,7
+35,10
@@
function establish_citadel_session() {
$sockname = "/tmp/" . $session . ".socket" ;
$sockname = "/tmp/" . $session . ".socket" ;
- $clientsocket = fsockopen('unix://' . $sockname, 0, $errno, $errstr, 5);
+ if (is_array(stat($sockname)))
+ $clientsocket = fsockopen(SOCKET_PREFIX.$sockname, 0, $errno, $errstr, 5);
+ else
+ $clientsocket = false;
if (!$clientsocket) {
// It ain't there, dude. Open up the proxy. (C version)
//$cmd = "./sessionproxy " . $sockname ;
if (!$clientsocket) {
// It ain't there, dude. Open up the proxy. (C version)
//$cmd = "./sessionproxy " . $sockname ;
@@
-59,7
+62,10
@@
function establish_citadel_session() {
$attempts = 0;
while (!$clientsocket) {
usleep(100);
$attempts = 0;
while (!$clientsocket) {
usleep(100);
- $clientsocket = fsockopen($sockname, 0, $errno, $errstr, 5);
+ if (is_array(stat($sockname)))
+ $clientsocket = fsockopen(SOCKET_PREFIX.$sockname, 0, $errno, $errstr, 5);
+ else
+ $clientsocket = false;
$attempts += 1;
if ($attempts > 100) {
echo "ERROR: unable to start connection proxy. ";
$attempts += 1;
if ($attempts > 100) {
echo "ERROR: unable to start connection proxy. ";
@@
-96,7
+102,7
@@
function establish_citadel_session() {
if (!isset($_SESSION["serv_humannode"])) {
$server_info = ctdl_get_serv_info();
if (!isset($_SESSION["serv_humannode"])) {
$server_info = ctdl_get_serv_info();
- print_r($server_info);
+
//
print_r($server_info);
$keys = array_keys($server_info);
foreach ($keys as $key)
$_SESSION[$key] = $server_info[$key];
$keys = array_keys($server_info);
foreach ($keys as $key)
$_SESSION[$key] = $server_info[$key];