Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion lib/private/Snowflake/FileSequence.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
class FileSequence implements ISequence {
/** Number of files to use */
private const NB_FILES = 20;
/** Lock file directory **/
public const LOCK_FILE_DIRECTORY = 'sfi_file_sequence';
/** Lock filename format **/
private const LOCK_FILE_FORMAT = 'seq-%03d.lock';
/** Delete sequences after SEQUENCE_TTL seconds **/
Expand All @@ -25,7 +27,25 @@ class FileSequence implements ISequence {
public function __construct(
ITempManager $tempManager,
) {
$this->workDir = $tempManager->getTemporaryFolder('.snowflakes');
$this->workDir = $tempManager->getTempBaseDir() . '/' . self::LOCK_FILE_DIRECTORY;
$this->ensureWorkdirExists();
}

private function ensureWorkdirExists(): void {
if (is_dir($this->workDir)) {
return;
}

if (@mkdir($this->workDir, 0700)) {
return;
}

// Maybe the directory was created in the meantime
if (is_dir($this->workDir)) {
return;
}

throw new \Exception('Fail to create file sequence directory');
}

#[Override]
Expand Down
10 changes: 5 additions & 5 deletions tests/lib/Snowflake/FileSequenceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ class FileSequenceTest extends ISequenceBase {

public function setUp():void {
$tempManager = $this->createMock(ITempManager::class);
$this->path = uniqid(sys_get_temp_dir() . '/php_test_seq_', true);
mkdir($this->path);
$tempManager->method('getTemporaryFolder')->willReturn($this->path);
$this->path = sys_get_temp_dir();
$tempManager->method('getTempBaseDir')->willReturn($this->path);
$this->sequence = new FileSequence($tempManager);
}

public function tearDown():void {
foreach (glob($this->path . '/*') as $file) {
$lockDirectory = $this->path . '/' . FileSequence::LOCK_FILE_DIRECTORY;
foreach (glob($lockDirectory . '/*') as $file) {
unlink($file);
}
rmdir($this->path);
rmdir($lockDirectory);
}
}
Loading