Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5d7af34 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch 'fix-logger' into 'production' 

Set correct logs level

See merge request !57
parents ccb450c0 f36de81b

src/Helpers/Builds.php

+4 −9
Original line number Original line Diff line number Diff line
@@ -64,15 +64,10 @@ 
        {

        {

            $ret = array();

            $ret = array();





            if(is_null($this->currentBuild)){

                $this->logger->info("Unable to find current build on server, returning empty array");

                return $ret;

            }



            foreach ($this->builds as $build) {

            foreach ($this->builds as $build) {

               

               

                if (!$build->checkVersion($this->currentBuild)) {

                if (!$build->checkVersion($this->currentBuild)) {

                    $this->logger->info($build->getIncremental().' ignored as build version is older than current version');

                    $this->logger->debug($build->getIncremental().' ignored as build version is older than current version');

                    continue;

                    continue;

                }

                }

                $isUpgradeSupported = false;

                $isUpgradeSupported = false;
@@ -80,7 +75,7 @@ 
                    $currentBuildVersion = $this->currentBuild->getAndroidVersion();

                    $currentBuildVersion = $this->currentBuild->getAndroidVersion();

                    $isUpgradeSupported = $build->getIsUpgradeSupported($currentBuildVersion);

                    $isUpgradeSupported = $build->getIsUpgradeSupported($currentBuildVersion);

                    if (!$isUpgradeSupported) {

                    if (!$isUpgradeSupported) {

                        $this->logger->info($build->getIncremental().' ignored as upgrade path is not permitted');

                        $this->logger->debug($build->getIncremental().' ignored as upgrade path is not permitted');

                        continue;

                        continue;

                    }

                    }

                }

                }
@@ -89,7 +84,7 @@ 
                    continue;

                    continue;

                }

                }

                

                

                $this->logger->info($build->getIncremental().' is a new update');

                $this->logger->debug($build->getIncremental().' is a new update');





                array_push($ret, array(

                array_push($ret, array(

                    // CyanogenMod

                    // CyanogenMod
@@ -214,7 +209,7 @@ 
                    $sourceIncremental = isset($this->postData['params']['source_incremental']) ? $this->postData['params']['source_incremental'] : NULL;

                    $sourceIncremental = isset($this->postData['params']['source_incremental']) ? $this->postData['params']['source_incremental'] : NULL;

                    if ($build->isValid($this->postData['params']) && $sourceIncremental && strcmp($sourceIncremental, $build->getIncremental()) === 0) {

                    if ($build->isValid($this->postData['params']) && $sourceIncremental && strcmp($sourceIncremental, $build->getIncremental()) === 0) {

                        $this->currentBuild = $build;

                        $this->currentBuild = $build;

                        $this->logger->info($build->getIncremental().' is the current build');

                        $this->logger->debug($build->getIncremental().' is the current build');

                        if($this->currenteOSVersion === -1){

                        if($this->currenteOSVersion === -1){

                            //get current version from build.prop

                            //get current version from build.prop

                            $this->currenteOSVersion = $this->currentBuild->getVersion();

                            $this->currenteOSVersion = $this->currentBuild->getVersion();