Update config_provider.py

config_provider.py

@@ -151,52 +151,72 @@ class ConfigProvider:
         with cls._file_lock:
             try:
                 # Load current config for race condition check
-                current_config = cls._load()
-                
-                # Check for race condition
-                if config.last_update_date and current_config.last_update_date:
-                    if not timestamps_equal(config.last_update_date, current_config.last_update_date):
-                        raise RaceConditionError(
-                            "Configuration was modified by another user",
-                            current_user=username,
-                            last_update_user=current_config.last_update_user,
-                            last_update_date=current_config.last_update_date,
-                            entity_type="configuration"
-                        )
+                try:
+                    current_config = cls._load()
+                    
+                    # Check for race condition
+                    if config.last_update_date and current_config.last_update_date:
+                        if not timestamps_equal(config.last_update_date, current_config.last_update_date):
+                            raise RaceConditionError(
+                                "Configuration was modified by another user",
+                                current_user=username,
+                                last_update_user=current_config.last_update_user,
+                                last_update_date=current_config.last_update_date,
+                                entity_type="configuration"
+                            )
+                except ConfigurationError as e:
+                    # Eğer mevcut config yüklenemiyorsa, race condition kontrolünü atla
+                    log_warning(f"Could not load current config for race condition check: {e}")
+                    current_config = None
                 
                 # Update metadata
                 config.last_update_date = get_current_timestamp()
                 config.last_update_user = username
                 
                 # Convert to JSON - Pydantic v2 kullanımı
-                data = config.model_dump(mode='json')  # to_jsonc_dict yerine model_dump
+                data = config.model_dump(mode='json')
                 json_str = json.dumps(data, ensure_ascii=False, indent=2)
                 
-                # Önce /tmp'de oluştur
-                with tempfile.NamedTemporaryFile(
-                    mode='w',
-                    encoding='utf-8',
-                    dir='/tmp',  # /app yerine /tmp kullan
-                    delete=False,
-                    prefix='flare_config_',
-                    suffix='.jsonc'
-                ) as tmp_file:
-                    tmp_file.write(json_str)
-                    temp_path = Path(tmp_file.name)
+                # Backup current file if exists
+                backup_path = None
+                if cls._CONFIG_PATH.exists():
+                    backup_path = cls._CONFIG_PATH.with_suffix('.backup')
+                    shutil.copy2(str(cls._CONFIG_PATH), str(backup_path))
+                    log_debug(f"Created backup at {backup_path}")
+                
+                try:
+                    # Write to temporary file first
+                    temp_path = cls._CONFIG_PATH.with_suffix('.tmp')
+                    with open(temp_path, 'w', encoding='utf-8') as f:
+                        f.write(json_str)
+                    
+                    # Validate the temp file by trying to load it
+                    with open(temp_path, 'r', encoding='utf-8') as f:
+                        test_data = commentjson.load(f)
+                        ServiceConfig.model_validate(test_data)
+                    
+                    # If validation passes, replace the original
+                    shutil.move(str(temp_path), str(cls._CONFIG_PATH))
+                    
+                    # Delete backup if save successful
+                    if backup_path and backup_path.exists():
+                        backup_path.unlink()
+                        
+                except Exception as e:
+                    # Restore from backup if something went wrong
+                    if backup_path and backup_path.exists():
+                        shutil.move(str(backup_path), str(cls._CONFIG_PATH))
+                        log_error(f"Restored configuration from backup due to error: {e}")
+                    raise
                 
-                # Sonra hedef konuma taşı
-                import shutil
-                shutil.move(str(temp_path), str(cls._CONFIG_PATH))
-                                
-                # Update cache
+                # Update cached instance
                 with cls._lock:
                     cls._instance = config
-                    cls._instance.build_index()
                 
                 log_info(
-                    "Configuration saved",
+                    "Configuration saved successfully",
                     user=username,
-                    size=len(json_str)
+                    last_update=config.last_update_date
                 )
                 
             except Exception as e: