Skip to content

Commit

Permalink
Fix chat time outs
Browse files Browse the repository at this point in the history
Fix error path
Add timeout to ajax pings
Add Github Issue Template
  • Loading branch information
causefx committed Oct 28, 2017
1 parent fe8d10d commit e481a1f
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 4 deletions.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!-- Please Fill out as much information as possible, Thanks! -->
###### Organizr Version: V 1.x
###### Branch: Master/Develop
###### WebSever: Nginx/Apache
###### Operating System: Windows/MacOS/Ubuntu
<hr>

##### Problem Description:
<!---TYPE HERE--->

<hr>

##### Reproduction Steps:
<!---TYPE HERE--->

<hr>

#### Errors on screen? If so paste here:
<!-- (Errors go below the first ``` . Don't remove the ' tags) -->
```
```
4 changes: 2 additions & 2 deletions chat/connect.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

$db = new SQLite3("../chatpack.db");
$db->busyTimeout(5000);
$db->busyTimeout(60000);
$db->exec("PRAGMA journal_mode = wal;");

?>
?>
2 changes: 1 addition & 1 deletion error.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
$$key = $value;
}
//error stuff
$requested = (isset($_SERVER['HTTPS']) ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
$requested = $_SERVER['REQUEST_URI'];
$codes = array(
400 => array('Bad Request', 'The server cannot or will not process the request due to an apparent client error.', 'sowwy'),
401 => array('Unauthorized', 'You do not have access to this page.', 'sowwy'),
Expand Down
18 changes: 17 additions & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,23 @@ function notify(notifyString, notifyIcon, notifyType, notifyLength, notifyLayout
$name = str_replace(array(':', '\\', '/', '*'), 'x', $ping);
if(strpos($type, 'image') !== false){ $style = "margin-top:28px"; }else{ $style = ""; }?>
var pingTab<?php echo $pingCount;?> = function() {
$("ping[class^='ping-<?php echo $name;?>']").load("ajax.php?a=get-ping&url=<?php echo $ping;?>&style=<?php echo $style;?>");
//$("ping[class^='ping-<?php echo $name;?>']").load("ajax.php?a=get-ping&url=<?php echo $ping;?>&style=<?php echo $style;?>");
$.ajax({
url: 'ajax.php?a=get-ping&url=<?php echo $ping;?>&style=<?php echo $style;?>',
timeout: 10000,
type: 'GET',
success: function(response) {
var getDiv = response;
if (typeof getDiv !== 'undefined') {
$("ping[class^='ping-<?php echo $name;?>']").html($(getDiv).prop('outerHTML'));
}else{
console.log('ping-<?php echo $name;?> data was not sufficent or is offline');
}
},
error: function(jqXHR, textStatus, errorThrown) {
console.error('ping-<?php echo $name;?> could not be updated');
}
});
};
// Initial Loads
pingTab<?php echo $pingCount;?>();
Expand Down

0 comments on commit e481a1f

Please sign in to comment.