Skip to content

Commit 88b03ad

Browse files
authored
Merge branch 'develop' into feature/ssl-off
2 parents 4ecfc0a + 3780529 commit 88b03ad

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11

22
<img src="https://i2.wp.com/easyengine.io/wp-content/uploads/sites/20/2019/06/[email protected]?fit=720%2C170&ssl=1" alt="EasyEngine Logo" />
33

4-
# EasyEngine v4
5-
[![Build Status](https://travis-ci.org/EasyEngine/easyengine.svg?branch=master-v4)](https://travis-ci.org/EasyEngine/easyengine) [![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/) [![Latest Stable Version](https://poser.pugx.org/easyengine/easyengine/v/stable)](https://packagist.org/packages/easyengine/easyengine) [![Latest Unstable Version](https://poser.pugx.org/easyengine/easyengine/v/unstable)](https://packagist.org/packages/easyengine/easyengine) [![License](https://poser.pugx.org/easyengine/easyengine/license)](https://packagist.org/packages/easyengine/easyengine)
4+
# EasyEngine v4 [![Build 🔨 + Test 👨‍🔧](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml/badge.svg?branch=develop)](https://github.com/EasyEngine/easyengine/actions/workflows/test_and_build.yml) [![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/) [![Latest Stable Version](https://poser.pugx.org/easyengine/easyengine/v/stable)](https://github.com/EasyEngine/easyengine/releases) [![License](https://poser.pugx.org/easyengine/easyengine/license)](https://packagist.org/packages/easyengine/easyengine)
65

76
EasyEngine makes it greatly easy to manage nginx, a fast web-server software that consumes little memory when handling increasing volumes of concurrent users.
87

php/EE/Runner.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -868,26 +868,11 @@ private function auto_check_update() {
868868
*/
869869
private function maybe_trigger_migration() {
870870

871-
$cache = EE::get_cache();
872-
873-
/**
874-
* Below condition ensures that running EE::launch() or runcommand()
875-
* in migration file does not trigget migration again.
876-
*/
877-
if ( $cache->read( 'migration_running' ) ) {
878-
EE::debug( 'Not triggering migrations since they seems to already been running.' );
879-
return;
880-
}
881-
882-
$cache->write( 'migration_running', true );
883-
884871
$db_version = Option::get( 'version' );
885872
$current_version = EE_VERSION;
886873

887874
if ( ! $db_version ) {
888875
$this->trigger_migration( $current_version );
889-
$cache->remove( 'migration_running' );
890-
891876
return;
892877
}
893878

@@ -913,8 +898,6 @@ private function maybe_trigger_migration() {
913898
} elseif ( false !== strpos( $current_version, 'nightly' ) ) {
914899
$this->trigger_migration( $current_version );
915900
}
916-
917-
$cache->remove( 'migration_running' );
918901
}
919902

920903
private function trigger_migration( $version ) {

0 commit comments

Comments
 (0)