<!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>[5453] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs: Plugin Directory: Update a scheduled job if another i18n import is triggered during the 15 minutes timeframe.</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/5453">5453</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/5453","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-01 11:00:53 +0000 (Mon, 01 May 2017)</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'>Plugin Directory: Update a scheduled job if another i18n import is triggered during the 15 minutes timeframe.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassmanagerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassplugini18nimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-i18n-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclasspluginimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassmanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php 2017-04-30 20:36:03 UTC (rev 5452)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php 2017-05-01 11:00:53 UTC (rev 5453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,12 +42,12 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the latest time that the scheduled hook will run
- *
- * @param string $hook The hook to look for.
- * @param string $when 'last' or 'next' for when the hook runs.
- * @return bool|int False on failure, The timestamp on success.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the latest time that the scheduled hook will run.
+ *
+ * @param string $hook The hook to look for.
+ * @param string $when 'last' or 'next' for when the hook runs.
+ * @return bool|int False on failure, The timestamp on success.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function get_scheduled_time( $hook, $when = 'last' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Flush the Cavalcade jobs cache, we need fresh data from the database
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,6 +63,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $crons as $timestamp => $cron ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $cron[ $hook ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cron[ $hook ] as $key => $cron_item ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cavalcade should present this field, if not, bail.
+ if ( empty( $cron_item['_job'] ) ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'waiting' === $cron_item['_job']->status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $timestamps[] = $timestamp;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,13 +88,102 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Reschedules a cavalcade job.
- * This requires the usage of Cavalcade, and will fail without it.
- *
- * @param string $hook The Hook to reschedule.
- * @param int $new_timestamp The time to reschedule it to.
- * @param int $old_timestamp The specific job to schedule. Optional, will affect first job otherwise.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the current scheduled events of a hook.
+ *
+ * @param string $hook The hook to look for.
+ * @param int|bool $next_timestamp Optional. Returns events for a specific timestamp.
+ * @return array Scheduled events.
+ */
+ public static function get_scheduled_events( $hook, $next_timestamp = false ) {
+
+ // Flush the Cavalcade jobs cache, we need fresh data from the database.
+ wp_cache_delete( 'jobs', 'cavalcade-jobs' );
+
+ $crons = _get_cron_array();
+ if ( empty( $crons ) ) {
+ return [];
+ }
+
+ $events = [];
+
+ foreach ( $crons as $timestamp => $cron ) {
+ if ( isset( $cron[ $hook ] ) ) {
+ foreach ( $cron[ $hook ] as $key => $cron_item ) {
+ // Cavalcade should present this field, if not, bail.
+ if ( empty( $cron_item['_job'] ) ) {
+ continue;
+ }
+
+ if ( 'waiting' !== $cron_item['_job']->status ) {
+ continue;
+ }
+
+ if ( ! $next_timestamp || $next_timestamp === $timestamp ) {
+ $events[] = [
+ 'hook' => $cron_item['_job']->hook,
+ 'args' => $cron_item['_job']->args,
+ 'nextrun' => $timestamp,
+ ];
+ }
+ }
+ }
+ }
+
+ return $events;
+ }
+
+ /**
+ * Updates a cavalcade job.
+ *
+ * This requires the usage of Cavalcade, and will fail without it.
+ *
+ * @param string $hook The hook to update.
+ * @param int $next_timestamp The time of the schedule to update.
+ * @param array $data The data to update.
+ * @return bool True on success, false on error.
+ */
+ public static function update_scheduled_event( $hook, $next_timestamp, $data ) {
+ // Flush the Cavalcade jobs cache, we need fresh data from the database
+ wp_cache_delete( 'jobs', 'cavalcade-jobs' );
+
+ $crons = _get_cron_array();
+ foreach ( $crons as $timestamp => $cron ) {
+ if ( $next_timestamp !== $timestamp ) {
+ continue;
+ }
+
+ if ( isset( $cron[ $hook ] ) ) {
+ foreach ( $cron[ $hook ] as $key => $event ) {
+ // Cavalcade should present this field, if not, bail.
+ if ( empty( $event['_job'] ) ) {
+ return false;
+ }
+
+ if ( 'waiting' !== $event['_job']->status ) {
+ return false;
+ }
+
+ $event['_job']->args = $data['args'];
+ $event['_job']->nextrun = $data['nextrun'];
+ $event['_job']->save();
+
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Reschedules a cavalcade job.
+ * This requires the usage of Cavalcade, and will fail without it.
+ *
+ * @param string $hook The hook to reschedule.
+ * @param int|bool $new_timestamp The time to reschedule it to.
+ * @param int|bool $old_timestamp The specific job to schedule. Optional, will affect first job otherwise.
+ * @return bool True on success, false on error.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function reschedule_event( $hook, $new_timestamp = false, $old_timestamp = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_timestamp = $new_timestamp ?: time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +198,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $cron[ $hook ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cron[ $hook ] as $key => $event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cavalcade should present this field,if not, bail.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cavalcade should present this field, if not, bail.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $event['_job'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclassplugini18nimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-i18n-import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-i18n-import.php 2017-04-30 20:36:03 UTC (rev 5452)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-i18n-import.php 2017-05-01 11:00:53 UTC (rev 5453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,10 +16,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Queue the job
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function queue( $plugin_slug, $plugin_data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // To avoid a situation where two imports run concurrently, if one is already scheduled, run it 1hr later (We'll trigger it after the current one finishes).
</del><span class="cx" style="display: block; padding: 0 10px"> $when_to_run = time() + 15 * MINUTE_IN_SECONDS;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $next_scheuled = Manager::get_scheduled_time( "import_plugin_i18n:{$plugin_slug}", 'last' ) ) {
- $when_to_run = $next_scheuled + HOUR_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $next_scheduled = Manager::get_scheduled_time( "import_plugin_i18n:{$plugin_slug}", 'last' );
+
+ // Update a scheduled event if it doesn't run in the next minute.
+ if ( $next_scheduled && $next_scheduled > time() + 1 * MINUTE_IN_SECONDS ) {
+ $next_scheduled_events = Manager::get_scheduled_events( "import_plugin_i18n:{$plugin_slug}",$next_scheduled );
+ if ( $next_scheduled_events ) {
+ $next_scheduled_event = array_shift( $next_scheduled_events );
+
+ $next_scheduled_event['args'][0]['tags_touched'] = array_merge(
+ $next_scheduled_event['args'][0]['tags_touched'],
+ $plugin_data['tags_touched']
+ );
+
+ if ( $plugin_data['readme_touched'] ) {
+ $next_scheduled_event['args'][0]['readme_touched'] = true;
+ }
+
+ if ( $plugin_data['code_touched'] ) {
+ $next_scheduled_event['args'][0]['code_touched'] = true;
+ }
+
+ if ( $plugin_data['assets_touched'] ) {
+ $next_scheduled_event['args'][0]['assets_touched'] = true;
+ }
+
+ $next_scheduled_event['args'][0]['revisions'] = array_merge(
+ $next_scheduled_event['args'][0]['revisions'],
+ $plugin_data['revisions']
+ );
+
+ $result = Manager::update_scheduled_event( "import_plugin_i18n:{$plugin_slug}", $next_scheduled, $next_scheduled_event );
+ if ( $result ) {
+ return;
+ }
+ }
</ins><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"> wp_schedule_single_event(
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclasspluginimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-import.php 2017-04-30 20:36:03 UTC (rev 5452)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-import.php 2017-05-01 11:00:53 UTC (rev 5453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function queue( $plugin_slug, $plugin_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // To avoid a situation where two imports run concurrently, if one is already scheduled, run it 1hr later (We'll trigger it after the current one finishes).
</span><span class="cx" style="display: block; padding: 0 10px"> $when_to_run = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $next_scheuled = Manager::get_scheduled_time( "import_plugin:{$plugin_slug}", 'last' ) ) {
- $when_to_run = $next_scheuled + HOUR_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $next_scheduled = Manager::get_scheduled_time( "import_plugin:{$plugin_slug}", 'last' ) ) {
+ $when_to_run = $next_scheduled + HOUR_IN_SECONDS;
</ins><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"> wp_schedule_single_event(
</span></span></pre>
</div>
</div>
</body>
</html>