<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2559] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php: WordCamp QBO: Bump the remote request timeout to 10 seconds.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2559">2559</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2559","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-23 15:21:23 +0000 (Tue, 23 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp QBO: Bump the remote request timeout to 10 seconds.
Some requests in production are timing out. For the most part, our error handling catches that gracefully, but there are some situations that still result in problems.
For instance, if we send a request to create an invoice, the QBO server receives it and proceses it, but doesn't respond in time, then we won't know that it was processed successfully, or the ID of the new invoice. If the deputy then tries to create the invoice again, a duplicate invoice will be created.
We may also need additional checks to prevent duplicates, but this should help mitigate similar problems.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqbowordcampqbophp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqbowordcampqbophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php 2016-02-23 10:22:11 UTC (rev 2558)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php 2016-02-23 15:21:23 UTC (rev 2559)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class WordCamp_QBO {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const REMOTE_REQUEST_TIMEOUT = 10; // seconds
+
</ins><span class="cx" style="display: block; padding: 0 10px"> private static $app_token;
</span><span class="cx" style="display: block; padding: 0 10px"> private static $consumer_key;
</span><span class="cx" style="display: block; padding: 0 10px"> private static $consumer_secret;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,6 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'GET', $request_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $request_url, array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Authorization' => $oauth_header,
</span><span class="cx" style="display: block; padding: 0 10px"> 'Accept' => 'application/json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,6 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'POST', $request_url, $payload );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_post( $request_url, array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Authorization' => $oauth_header,
</span><span class="cx" style="display: block; padding: 0 10px"> 'Accept' => 'application/json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,10 +251,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$api_base_url, self::$options['auth']['realmId'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'GET', $request_url, $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = wp_remote_get( esc_url_raw( add_query_arg( $args, $request_url ) ), array( 'headers' => array(
- 'Authorization' => $oauth_header,
- 'Accept' => 'application/json',
- ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = wp_remote_get(
+ esc_url_raw( add_query_arg( $args, $request_url ) ),
+ array(
+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
+ 'headers' => array(
+ 'Authorization' => $oauth_header,
+ 'Accept' => 'application/json',
+ )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) !== 200 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'error', 'Could not fetch classes.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,6 +510,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = wp_json_encode( $payload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Authorization' => $oauth->get_oauth_header( 'POST', $request_url, $payload ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Accept' => 'application/json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,6 +573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Authorization' => $oauth->get_oauth_header( 'POST', $request_url ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Accept' => 'application/json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,6 +698,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Authorization' => $oauth->get_oauth_header( 'GET', $request_url, $request_url_query ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Accept' => 'application/json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,6 +836,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = wp_json_encode( $payload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Authorization' => $oauth->get_oauth_header( 'POST', $request_url, $payload ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Accept' => 'application/json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,6 +934,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Authorization' => $oauth->get_oauth_header( 'GET', $request_url, $request_url_query ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Accept' => 'application/json',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,10 +1045,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$api_base_url, self::$options['auth']['realmId'], self::$options['auth']['realmId'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'GET', $request_url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = wp_remote_get( $request_url, array( 'headers' => array(
- 'Authorization' => $oauth_header,
- 'Accept' => 'application/json',
- ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = wp_remote_get( $request_url, array(
+ 'timeout' => self::REMOTE_REQUEST_TIMEOUT,
+ 'headers' => array(
+ 'Authorization' => $oauth_header,
+ 'Accept' => 'application/json',
+ )
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 'Could not obtain company information.' );
</span></span></pre>
</div>
</div>
</body>
</html>