update

microweber-dev · Jan 15, 2024 · 441abe1 · 441abe1
1 parent 946457c
commit 441abe1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/app/Console/Commands/TestBuild.php b/app/Console/Commands/TestBuild.php
@@ -47,16 +47,19 @@ public function handle()
     {
         $this->info('Start job work...');
 
-        $getWaitingPackage = Package::where('id', 161)->first();
-        if ($getWaitingPackage == null) {
+        $getPackage = Package::where('id', 10)->first();
+        if ($getPackage == null) {
             $this->error('No packages for processing. Time: ' . date('Y-m-d H:i:s'));
             return 0;
         }
 
-        $this->info('Package: ' . $getWaitingPackage->name);
+        $this->info('Package: ' . $getPackage->name);
 
-        $run = new ProcessPackageSatis($getWaitingPackage->id, $getWaitingPackage->name);
-        $run->handle();
+        $getPackage->clone_status = Package::CLONE_STATUS_WAITING;
+        $getPackage->save();
+
+        $run = new ProcessPackageSatis($getPackage->id, $getPackage->name);
+        $status = $run->handle();
 
         $this->info('Job work done.');
 

diff --git a/app/Jobs/ProcessPackageSatis.php b/app/Jobs/ProcessPackageSatis.php
@@ -102,7 +102,10 @@ public function handle()
             // job already running
             $packageModel->clone_log = "Already running.";
             $packageModel->save();
-            return;
+            return [
+                'status' => 'error',
+                'message' => 'Already running.'
+            ];
         }
 
         $packageModel->clone_log = "Job is started.";

diff --git a/app/SatisPackageBuilder.php b/app/SatisPackageBuilder.php
@@ -99,6 +99,7 @@ public static function build($file)
         $shellCommand .= ' ' . $satisConfigFile;
         $shellCommand .= ' ' . $satisRepositoryOutputPath;
         $shellCommand .= ' > ' . $satisBuildLog;
+
         exec($shellCommand);
 
         $i = 0;

diff --git a/database/migrations/2021_12_16_141213_create_packages_table.php b/database/migrations/2021_12_16_141213_create_packages_table.php
@@ -44,6 +44,7 @@ public function up()
             $table->timestamp('clone_queue_at')->nullable();
             $table->longText('clone_log')->nullable();
             $table->integer('is_cloned')->default(0)->nullable();
+            $table->integer('debug_count')->nullable();
 
             $table->timestamps();
         });