geoip api down, add timeout to call

d5dd349c · David Morley · fd667659 · d5dd349c · d5dd349c
Commit d5dd349c authored Nov 10, 2011 by David Morley
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 14 deletions

db/pull.php db/pull.php +4 -3

index.php index.php +13 -11

No files found.
--- a/db/pull.php
+++ b/db/pull.php
@@ -9,7 +9,7 @@
     }
 //foreach pod check it and update db    
 if ($_GET['domain']) {$domain=$_GET['domain'];$sql = "SELECT domain,pingdomurl,score FROM pods WHERE domain = '$domain'";$sleep="0";} 
- else {$sql = "SELECT domain,pingdomurl,score FROM pods";$sleep="19";}
+ else {$sql = "SELECT domain,pingdomurl,score FROM pods";$sleep="10";}

 $result = pg_query($dbh, $sql);
 if (!$result) {
@@ -22,7 +22,7 @@
     $score = $row[$i]['score'];

 //get ratings
- $userrate=0;$adminrate=0;
+ $userrate=0;$adminrate=0;$userratingavg="";$adminratingavg="";
 $sqlforr = "SELECT * FROM rating_comments WHERE domain = '$domain'";
 $ratings = pg_query($dbh, $sqlforr);
 if (!$ratings) {
@@ -149,6 +149,7 @@ $ipv6="yes";
        curl_setopt($hostip, CURLOPT_POST, 0);
        curl_setopt($hostip, CURLOPT_HEADER, 0);
        curl_setopt($hostip, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($hostip, CURLOPT_CONNECTTIMEOUT, 5);
        curl_setopt($hostip, CURLOPT_NOBODY, 0);
        curl_setopt($hostip, CURLOPT_MAXCONNECTS, 5);
        curl_setopt($hostip, CURLOPT_FOLLOWLOCATION, true);
@@ -239,4 +240,4 @@ sleep($sleep);
    
     pg_close($dbh);

-?>
\ No newline at end of file
+?>
--- a/index.php
+++ b/index.php
 <!doctype html><html><head><meta charset="utf-8"><title>Diaspora Pod uptime - Find your new social home</title>
 <meta name="keywords" content="diaspora, podupti.me, diasp, diasporg, diasp.org, facebook, open source social, open source facebook, open source social network" />
-<meta name="description" content="Diaspora Pod Live Status. diasp.org pod uptime monitor for Diaspora pods" />
+<meta name="description" content="Diaspora Pod Live Status. Find a Diaspora pod to sign up for, rate pods, find one close to you!" />
 <script type="text/javascript" src="/js/jquery-1.6.4.min.js"></script> 
 <script type="text/javascript" src="/js/jquery.tablesorter.min.js"></script> 
 <script type="text/javascript" src="/js/jquery.loading.1.6.4.min.js"></script> 
@@ -122,16 +122,18 @@ is mostly because of selfsigned or openca certs, if you need a free ssl cert get
        <br>Need help? <a href="http://frodointernet.com/support">Support</a>
        <br>
      </div>
-      <script type="text/javascript">
-      var pkBaseURL = (("https:" == document.location.protocol) ? "https://frodointernet.com/s/" : "http://frodointernet.com/s/");
-      document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-      </script><script type="text/javascript">
-      try {
-      var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3);
-      piwikTracker.trackPageView();
-      piwikTracker.enableLinkTracking();
-      } catch( err ) {}
-      </script><noscript><p><img src="http://frodointernet.com/s/piwik.php?idsite=3" style="border:0" alt="" /></p></noscript>
+<script type="text/javascript">
+var clicky_site_ids = clicky_site_ids || [];
+clicky_site_ids.push(66500192);
+(function() {
+  var s = document.createElement('script');
+  s.type = 'text/javascript';
+  s.async = true;
+  s.src = '//static.getclicky.com/js';
+  ( document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0] ).appendChild( s );
+})();
+</script>
+<noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/66500192ns.gif" /></p></noscript>
      <script type="text/javascript">
      /* <![CDATA[ */
          (function() {